From ad1839c0c3e6b4d9a757b6ca381ced2a8bbc467c Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Tue, 13 Sep 2022 14:40:00 +0200
Subject: [PATCH] Update for marshal positions

---
 GIS Base Map/Gun Run.qgs           | 30944 ++++++++++++++-------------
 GIS Base Map/Gun Run.qgs~          | 30944 ++++++++++++++-------------
 GIS Base Map/marshal_positions.dbf |   Bin 47650 -> 47650 bytes
 3 files changed, 30946 insertions(+), 30942 deletions(-)

diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 13eb7cd..20eec4a 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 saveUser="tim" version="3.26.3-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run" saveDateTime="2022-09-13T10:52:25">
+<qgis version="3.26.3-Buenos Aires" saveDateTime="2022-09-13T14:39:10" saveUserFull="Timothy Allen" saveUser="tim" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,256 +21,257 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Checked" name="Marshals" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Marshals" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="marshal_positions" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="marshal_positions [460]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-            <Option type="int" name="showFeatureCount" value="1"/>
+            <Option name="cached_name" type="QString" value="marshal_positions [460]"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="extra_security" expanded="1" source="./extra_security.shp" legend_exp="" id="extra_security20170921130834191" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./extra_security.shp" id="extra_security20170921130834191" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="extra_security">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="marshals_by_position" expanded="1" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" id="marshals_by_position20161003112326575" providerKey="delimitedtext">
+      <layer-tree-layer providerKey="delimitedtext" expanded="1" patch_size="0,0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="marshals_by_position">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="marshals_by_position"/>
+            <Option name="cached_name" type="QString" value="marshals_by_position"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="complete_marshal_overview" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual">
+      <layer-tree-layer providerKey="virtual" expanded="1" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="complete_marshal_overview">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="marshal_overviews" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="0" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="marshal_overviews">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="fencing" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="fencing">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="fencing"/>
-            <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <Option name="cached_name" type="QString" value="fencing"/>
+            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" patch_size="-1,-1" legend_split_behavior="0" name="cone_only_groups" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" legend_exp="" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual">
+      <layer-tree-layer providerKey="virtual" expanded="1" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="cone_only_groups">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" name="fence_and_cone_groups" expanded="1" 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" legend_exp="" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual">
+      <layer-tree-layer providerKey="virtual" expanded="1" patch_size="-1,-1" 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" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="fence_and_cone_groups">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1" groupLayer="">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Markers" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer checked="Qt::Checked" patch_size="-1,-1" legend_split_behavior="0" name="route_markers" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=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={3ca1439b-1443-4540-aaff-f2005b5a5ee8}" legend_exp="" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" providerKey="memory">
+        <layer-tree-layer providerKey="memory" expanded="1" patch_size="-1,-1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=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={db62f167-3190-46c0-ae06-2db51050a620}" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="route_markers">
           <customproperties>
             <Option type="Map">
-              <Option type="QString" name="cached_name" value="route_markers"/>
+              <Option name="cached_name" type="QString" value="route_markers"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="all_routes"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="int" name="showFeatureCount" value="0"/>
+            <Option name="cached_name" type="QString" value="all_routes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" type="int" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="timelapse" expanded="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " legend_exp="" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr">
+    <layer-tree-layer providerKey="ogr" expanded="0" patch_size="0,0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="timelapse">
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="cached_name" value="timelapse"/>
+          <Option name="cached_name" type="QString" value="timelapse"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group checked="Qt::Checked" name="Feeding Stations" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Feeding Stations" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="water_tables" expanded="1" source="./water_tables.shp" legend_exp="" id="water_tables20170921142016467" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./water_tables.shp" id="water_tables20170921142016467" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="water_tables">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="water_tables"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="water_tables"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Ask Me" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Ask Me" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="poi_labels" expanded="1" source="./poi_labels.shp|layername=poi_labels" legend_exp="" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="poi_labels">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="poi_labels"/>
+            <Option name="cached_name" type="QString" value="poi_labels"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="directions_to_start" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="directions_to_start">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="directions_to_start"/>
+            <Option name="cached_name" type="QString" value="directions_to_start"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Residents Access" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Residents Access" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="mayor" expanded="1" source="./mayor.shp" legend_exp="" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./mayor.shp" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="mayor">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="mayor"/>
+            <Option name="cached_name" type="QString" value="mayor"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="viplabels" expanded="1" source="./viplabels.shp" legend_exp="" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./viplabels.shp" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="viplabels">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="viplabels"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="viplabels"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="vipaccess" expanded="1" source="./vipaccess.shp" legend_exp="" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./vipaccess.shp" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="vipaccess">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="vipaccess"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="vipaccess"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="golfaccess" expanded="0" source="./golfaccess.shp" legend_exp="" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="0" patch_size="0,0" source="./golfaccess.shp" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="golfaccess">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="residents_access_roads" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="residents_access_roads"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="residents_access_roads"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="residents_access" expanded="1" source="./residents_access.shp|layername=residents_access" legend_exp="" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="OSM data" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="osm_roads" expanded="0" source="./osm_roads.shp" legend_exp="" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="0" patch_size="0,0" source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="osm_roads">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="osm_roads [3887]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option name="cached_name" type="QString" value="osm_roads [3887]"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="osm_places" expanded="1" source="./osm_places.shp|layername=osm_places" legend_exp="" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="osm_places">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="osm_places [7]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option name="cached_name" type="QString" value="osm_places [7]"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Start and Finish pages" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="data-comments" expanded="1" source="./data-comments.shp" legend_exp="" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="data-comments">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="start_finish_area" expanded="1" source="./start_finish_area.shp" legend_exp="" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="start_finish_area">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Elevation" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="capetownelevation-1m" expanded="1" source="./capetownelevation-1m.shp" legend_exp="" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="capetownelevation-1m">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Map" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Map" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal">
+      <layer-tree-layer providerKey="gdal" expanded="0" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="GDAL-City of Cape Town 2015 Aerial"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="GDAL-City of Cape Town 2015 Aerial"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="Outlines" expanded="1" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" legend_exp="" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms">
+      <layer-tree-layer providerKey="wms" expanded="1" patch_size="0,0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="Outlines">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="Outlines"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="Outlines"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -304,32 +305,32 @@
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" minScale="0" type="1" tolerance="10" mode="3" self-snapping="1" scaleDependencyMode="0" enabled="0" intersection-snapping="1" maxScale="0">
+  <snapping-settings self-snapping="1" enabled="0" scaleDependencyMode="0" unit="1" intersection-snapping="1" tolerance="10" minScale="0" maxScale="0" mode="3" type="1">
     <individual-layer-settings>
-      <layer-setting minScale="0" type="1" tolerance="12" units="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="20" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="0" tolerance="12" units="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="0" units="2" id="water_tables20170921142016467" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="0" tolerance="12" units="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="1" tolerance="12" units="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="1" tolerance="12" units="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="0" units="2" id="extra_security20170921130834191" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="1" tolerance="12" units="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="0" tolerance="12" units="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" maxScale="0"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" type="0" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="0" minScale="0" maxScale="0" id="water_tables20170921142016467" type="2" units="2"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" units="1"/>
+      <layer-setting enabled="1" tolerance="20" minScale="0" maxScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="0" minScale="0" maxScale="0" id="extra_security20170921130834191" type="2" units="2"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" type="0" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="0" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -337,10 +338,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.38526494898227526</xmin>
-      <ymin>-33.91824698446153263</ymin>
-      <xmax>18.38637629180237809</xmax>
-      <ymax>-33.91766469406456963</ymax>
+      <xmin>18.38488783522326742</xmin>
+      <ymin>-33.91807806892364141</ymin>
+      <xmax>18.38599917804337025</xmax>
+      <ymax>-33.91749577852667841</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -362,165 +363,165 @@
   <projectModels/>
   <legend updateDrawingOrder="true">
     <legendgroup checked="Qt::Checked" name="Marshals" open="true">
-      <legendlayer checked="Qt::Checked" name="marshal_positions" showFeatureCount="1" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" name="marshal_positions" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="extra_security" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="extra_security" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="marshals_by_position" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked" name="marshals_by_position" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="complete_marshal_overview" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="marshal_overviews" showFeatureCount="0" drawingOrder="-1" open="false">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="marshal_overviews" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" name="Fencing and Cones" open="true">
-      <legendlayer checked="Qt::Checked" name="fencing" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="fencing" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="cone_only_groups" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="cone_only_groups" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="fence_and_cone_groups" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" name="Routes" open="true">
       <legendgroup checked="Qt::Checked" name="Markers" open="true">
-        <legendlayer checked="Qt::Checked" name="route_markers" showFeatureCount="0" drawingOrder="-1" open="true">
+        <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="route_markers" open="true">
           <filegroup hidden="false" open="true">
-            <legendlayerfile layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" isInOverview="0" visible="1"/>
+            <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" name="all_routes" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="all_routes" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" name="timelapse" showFeatureCount="0" drawingOrder="-1" open="false">
+    <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="timelapse" open="false">
       <filegroup hidden="false" open="false">
-        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
+        <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
     <legendgroup checked="Qt::Checked" name="Feeding Stations" open="true">
-      <legendlayer checked="Qt::Checked" name="water_tables" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="water_tables" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
-      <legendlayer checked="Qt::Unchecked" name="poi_labels" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="poi_labels" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="directions_to_start" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
-      <legendlayer checked="Qt::Unchecked" name="mayor" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="mayor" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="viplabels" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="viplabels" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="vipaccess" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="vipaccess" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="golfaccess" showFeatureCount="0" drawingOrder="-1" open="false">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="golfaccess" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="residents_access_roads" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="residents_access" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="residents_access" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" name="OSM data" open="true">
-      <legendlayer checked="Qt::Checked" name="osm_roads" showFeatureCount="1" drawingOrder="-1" open="false">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" name="osm_roads" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="osm_places" showFeatureCount="1" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" name="osm_places" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
-      <legendlayer checked="Qt::Unchecked" name="data-comments" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="data-comments" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="start_finish_area" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
-      <legendlayer checked="Qt::Unchecked" name="capetownelevation-1m" showFeatureCount="1" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked" name="capetownelevation-1m" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" name="Map" open="true">
-      <legendlayer checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" drawingOrder="-1" open="false">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" 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"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="Outlines" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="Outlines" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshTime="0" type="annotation" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="">
+  <main-annotation-layer refreshOnNotifyMessage="" autoRefreshTime="0" autoRefreshEnabled="0" legendPlaceholderImage="" type="annotation" refreshOnNotifyEnabled="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -571,7 +572,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" legendPlaceholderImage="" maxScale="100000">
+    <maplayer refreshOnNotifyMessage="" autoRefreshTime="0" maxScale="100000" minScale="1e+08" autoRefreshEnabled="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="raster" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -636,7 +637,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -647,9 +648,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -661,58 +662,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" symbology="Line" zscale="1" enabled="0">
+      <elevation enabled="0" band="1" symbology="Line" zoffset="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="152,125,183,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -743,36 +744,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -787,9 +788,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -798,27 +799,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="WMSBackgroundLayer" value="false"/>
-          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="identify/format" value="Value"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Value"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" name="name" value=""/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option type="QString" name="type" value="collection"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer redBand="1" greenBand="2" type="multibandcolor" blueBand="3" nodataColor="" alphaBand="-1" opacity="0.5">
+        <rasterrenderer redBand="1" alphaBand="-1" nodataColor="" greenBand="2" opacity="0.5" blueBand="3" type="multibandcolor">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -829,14 +830,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
-        <huesaturation colorizeRed="255" colorizeBlue="128" saturation="0" colorizeGreen="128" colorizeOn="0" colorizeStrength="100" grayscaleMode="0" invertColors="0"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation saturation="0" colorizeGreen="128" colorizeStrength="100" colorizeBlue="128" colorizeRed="255" invertColors="0" colorizeOn="0" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" legendPlaceholderImage="" maxScale="0">
+    <maplayer refreshOnNotifyMessage="" autoRefreshTime="0" maxScale="0" minScale="1e+08" autoRefreshEnabled="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="raster" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -901,7 +902,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -912,7 +913,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -924,58 +925,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" symbology="Line" zscale="1" enabled="0">
+      <elevation enabled="0" band="1" symbology="Line" zoffset="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1006,36 +1007,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -1050,9 +1051,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1061,27 +1062,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="WMSBackgroundLayer" value="true"/>
-          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="identify/format" value="Undefined"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Undefined"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" name="name" value=""/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option type="QString" name="type" value="collection"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer type="singlebandcolordata" nodataColor="" band="1" alphaBand="-1" opacity="0.75">
+        <rasterrenderer alphaBand="-1" nodataColor="" band="1" opacity="0.75" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1092,14 +1093,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
-        <huesaturation colorizeRed="255" colorizeBlue="128" saturation="0" colorizeGreen="128" colorizeOn="0" colorizeStrength="100" grayscaleMode="0" invertColors="0"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation saturation="0" colorizeGreen="128" colorizeStrength="100" colorizeBlue="128" colorizeRed="255" invertColors="0" colorizeOn="0" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1164,7 +1165,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1178,8 +1179,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" comment="" expression="$length * 100" name="length_km" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="$length * 100 * 1000" name="length_m" type="6" subType="0" precision="0" typeName="double precision"/>
+        <field comment="" length="-1" expression="$length * 100" name="length_km" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="$length * 100 * 1000" name="length_m" precision="0" type="6" typeName="double precision" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1192,58 +1193,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="RouteLen" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="RouteLen" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="229,182,54,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1274,36 +1275,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -1318,44 +1319,44 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -1378,59 +1379,59 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule checkstate="0" label="Active Routes" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" symbol="0" description="Only show when active in Atlas" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule checkstate="0" label="21KM" filter="&quot;Source&quot; = '21KM'" symbol="1" description="This should be disabled, since it's only for legends" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule checkstate="0" label="10KM" filter="&quot;Source&quot; = '10KM'" symbol="2" description="This should be disabled, since it's only for legends" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule checkstate="0" label="5KM" filter="&quot;Source&quot; = '5KM'" symbol="3" description="This should be disabled, since it's only for legends" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule checkstate="0" label="Trail" filter="&quot;Source&quot; = 'Trail'" symbol="4" description="This should be disabled, since it's only for legends" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <rule key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" symbol="0" label="Active Routes" description="Only show when active in Atlas" checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
+            <rule key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" symbol="1" label="21KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '21KM'"/>
+            <rule key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" symbol="2" label="10KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '10KM'"/>
+            <rule key="{bdafe9b2-4918-427d-89be-41870f96981f}" symbol="3" label="5KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '5KM'"/>
+            <rule key="{151f553a-04cc-4e24-b74d-37d5618f5223}" symbol="4" label="Trail" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = 'Trail'"/>
           </rule>
-          <rule label="Show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule checkstate="0" label="21KM" filter="&quot;Source&quot; = '21KM'" symbol="6" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule checkstate="0" label="10KM" filter="&quot;Source&quot; = '10KM'" symbol="7" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule checkstate="0" label="5KM" filter="&quot;Source&quot; = '5KM'" symbol="8" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule checkstate="0" label="Trail" filter="&quot;Source&quot; = 'Trail'" symbol="9" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="5" label="Show by day" 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)' ) )">
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="6" label="21KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '21KM'"/>
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="7" label="10KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '10KM'"/>
+            <rule key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="8" label="5KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '5KM'"/>
+            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="9" label="Trail" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = 'Trail'"/>
           </rule>
-          <rule checkstate="0" label="Always show" symbol="10" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule checkstate="0" label="Always show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="11" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="10" label="Always show" checkstate="0"/>
+          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="11" label="Always show by day" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1450,44 +1451,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -1503,32 +1504,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@0@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@0@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -1543,15 +1544,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1559,35 +1560,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1618,36 +1619,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1667,40 +1668,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1723,38 +1724,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1774,40 +1775,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1830,47 +1831,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1890,44 +1891,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -1943,32 +1944,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -1983,15 +1984,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1999,35 +2000,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2058,36 +2059,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2107,40 +2108,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2163,38 +2164,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2214,40 +2215,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2270,58 +2271,58 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="10" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="10" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2352,56 +2353,56 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="11" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="11" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.46"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.46"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2432,45 +2433,45 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2490,44 +2491,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -2543,32 +2544,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@2@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -2583,15 +2584,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2599,35 +2600,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2658,36 +2659,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2707,40 +2708,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2763,38 +2764,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2814,40 +2815,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2870,47 +2871,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="3" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2930,44 +2931,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@3@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@3@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -2983,32 +2984,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@3@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@3@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="145,211,55,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="145,211,55,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -3023,15 +3024,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3039,35 +3040,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,211,55,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,211,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3098,36 +3099,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3147,40 +3148,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@3@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@3@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3203,38 +3204,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3254,40 +3255,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@3@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@3@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3310,47 +3311,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="4" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="4" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3370,44 +3371,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@4@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@4@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -3423,32 +3424,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@4@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@4@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,72,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,72,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -3463,15 +3464,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3479,35 +3480,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,72,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,72,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3538,36 +3539,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3587,40 +3588,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@4@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@4@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3643,38 +3644,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3694,40 +3695,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@4@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@4@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3750,47 +3751,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="5" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="5" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3810,44 +3811,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@5@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@5@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -3863,32 +3864,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@5@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@5@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -3903,15 +3904,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3919,35 +3920,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3978,36 +3979,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4027,40 +4028,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@5@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@5@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4083,38 +4084,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4134,40 +4135,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@5@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@5@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4190,47 +4191,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="6" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="6" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4250,44 +4251,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@6@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@6@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -4303,32 +4304,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@6@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@6@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -4343,15 +4344,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4359,35 +4360,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4418,36 +4419,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4467,40 +4468,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@6@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@6@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4523,38 +4524,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4574,40 +4575,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@6@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@6@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4630,47 +4631,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="7" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="7" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4690,44 +4691,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@7@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@7@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -4743,32 +4744,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@7@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@7@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -4783,15 +4784,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4799,35 +4800,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4858,36 +4859,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4907,40 +4908,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@7@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@7@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4963,38 +4964,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5014,40 +5015,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@7@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@7@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5070,47 +5071,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="8" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="8" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5130,44 +5131,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@8@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@8@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -5183,32 +5184,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@8@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@8@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="145,211,55,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="145,211,55,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -5223,15 +5224,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5239,35 +5240,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,211,55,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,211,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5298,36 +5299,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5347,40 +5348,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@8@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@8@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5403,38 +5404,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5454,40 +5455,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@8@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@8@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5510,47 +5511,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="9" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="9" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5570,44 +5571,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@9@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@9@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -5623,32 +5624,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@9@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@9@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,72,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,72,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -5663,15 +5664,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5679,35 +5680,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,72,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,72,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5738,36 +5739,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5787,40 +5788,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@9@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@9@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5843,38 +5844,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5894,40 +5895,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@9@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@9@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5950,15 +5951,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5967,47 +5968,47 @@
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
+          <rule key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" active="0" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="round($length / 1000, 0)" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="round($length / 1000, 0)" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="164,113,88,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -6030,34 +6031,34 @@
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -6072,98 +6073,98 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="0" geometryGenerator="km_marker()" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="1" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="3" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="km_marker()" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="3" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="1" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -6172,10 +6173,10 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
@@ -6184,56 +6185,56 @@
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -6264,9 +6265,9 @@
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6274,215 +6275,215 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Name" index="0"/>
-        <alias name="" field="descriptio" index="1"/>
-        <alias name="" field="timestamp" index="2"/>
-        <alias name="" field="begin" index="3"/>
-        <alias name="" field="end" index="4"/>
-        <alias name="" field="Distance" index="5"/>
-        <alias name="" field="RouteLen" index="6"/>
-        <alias name="" field="Source" index="7"/>
-        <alias name="" field="Sort" index="8"/>
-        <alias name="" field="day" index="9"/>
-        <alias name="" field="length_km" index="10"/>
-        <alias name="" field="length_m" index="11"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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 field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="Sort" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_m" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Sort" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="Name" desc=""/>
-        <constraint exp="" field="descriptio" desc=""/>
-        <constraint exp="" field="timestamp" desc=""/>
-        <constraint exp="" field="begin" desc=""/>
-        <constraint exp="" field="end" desc=""/>
-        <constraint exp="" field="Distance" desc=""/>
-        <constraint exp="" field="RouteLen" desc=""/>
-        <constraint exp="" field="Source" desc=""/>
-        <constraint exp="" field="Sort" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="length_km" desc=""/>
-        <constraint exp="" field="length_m" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" comment="" expression="$length * 100" name="length_km" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="$length * 100 * 1000" name="length_m" type="6" subType="0" precision="0" typeName="double precision"/>
+        <field comment="" length="-1" expression="$length * 100" name="length_km" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="$length * 100 * 1000" name="length_m" precision="0" type="6" typeName="double precision" subType="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;length_m&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="1" sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="Name" hidden="0" width="152"/>
-          <column type="field" name="descriptio" hidden="0" width="-1"/>
-          <column type="field" name="timestamp" hidden="0" width="-1"/>
-          <column type="field" name="begin" hidden="0" width="163"/>
-          <column type="field" name="end" hidden="0" width="-1"/>
-          <column type="field" name="Distance" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="RouteLen" hidden="0" width="-1"/>
-          <column type="field" name="Source" hidden="0" width="-1"/>
-          <column type="field" name="length_m" hidden="0" width="188"/>
-          <column type="field" name="Sort" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="length_km" hidden="0" width="266"/>
+          <column hidden="0" name="Name" type="field" width="152"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="163"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="188"/>
+          <column hidden="0" name="Sort" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="266"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6514,18 +6515,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="0"/>
-        <field name="length_m" editable="0"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="0" name="length_km"/>
+        <field editable="0" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -6542,25 +6543,25 @@ def my_form_open(dialog, layer, feature):
         <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 maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6633,58 +6634,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="196,60,57,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6715,36 +6716,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -6759,44 +6760,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -6819,54 +6820,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="183,72,75,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="183,72,75,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6897,9 +6898,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6910,36 +6911,36 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -6948,30 +6949,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="ID" index="0"/>
-        <alias name="" field="height" index="1"/>
-        <alias name="" field="elevation" index="2"/>
+        <alias field="ID" index="0" name=""/>
+        <alias field="height" index="1" name=""/>
+        <alias field="elevation" index="2" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="ID"/>
-        <default expression="" applyOnUpdate="0" field="height"/>
-        <default expression="" applyOnUpdate="0" field="elevation"/>
+        <default field="ID" expression="" applyOnUpdate="0"/>
+        <default field="height" expression="" applyOnUpdate="0"/>
+        <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="ID" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="height" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="elevation" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="ID" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="height" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="elevation" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="ID" desc=""/>
-        <constraint exp="" field="height" desc=""/>
-        <constraint exp="" field="elevation" desc=""/>
+        <constraint field="ID" desc="" exp=""/>
+        <constraint field="height" desc="" exp=""/>
+        <constraint field="elevation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6994,7 +6995,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Polygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7069,58 +7070,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="133,182,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="133,182,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7151,36 +7152,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -7195,44 +7196,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7255,38 +7256,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -7301,9 +7302,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7314,45 +7315,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -7361,34 +7362,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
-        <alias name="" field="page" index="2"/>
-        <alias name="" field="day" index="3"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="page" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="page" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="page" desc=""/>
-        <constraint exp="" field="day" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7411,7 +7412,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Polygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7486,58 +7487,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="243,166,178,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7568,36 +7569,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="243,166,178,255" k="color"/>
@@ -7612,44 +7613,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7672,38 +7673,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="38,162,105,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="f_diagonal"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="38,162,105,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="f_diagonal"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -7718,9 +7719,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="f_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7731,59 +7732,59 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option type="int" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="int" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="5" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="0" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="1" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="0" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="1" minScaleDenominator="0" penColor="#000000" spacing="5" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="0" underline="0" bold="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -7814,9 +7815,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7824,57 +7825,57 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="1" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option type="double" name="allowedGapsBuffer" value="0"/>
-            <Option type="bool" name="allowedGapsEnabled" value="false"/>
-            <Option type="QString" name="allowedGapsLayer" value=""/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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="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="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7883,45 +7884,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="name" index="0"/>
-        <alias name="" field="group" index="1"/>
-        <alias name="" field="type" index="2"/>
-        <alias name="" field="day" index="3"/>
-        <alias name="" field="cone_len" index="4"/>
+        <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=""/>
       </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"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="group" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="cone_len" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="name" hidden="0" width="306"/>
-          <column type="field" name="group" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="cone_len" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="name" type="field" width="306"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="cone_len" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7953,11 +7954,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="cone_len" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <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"/>
@@ -7967,18 +7968,18 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -8043,7 +8044,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8068,58 +8069,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,178,151,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8150,36 +8151,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -8194,44 +8195,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -8254,54 +8255,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,85,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,85,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8332,9 +8333,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8345,32 +8346,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="Name" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" fieldName="Name" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -8385,116 +8386,116 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="LineGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="LineGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="Name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -8525,9 +8526,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8535,30 +8536,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -8567,30 +8568,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="Name" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Name" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Name" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="Name" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Name" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="Name" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8622,8 +8623,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Name" editable="1"/>
-        <field name="id" editable="1"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Name"/>
@@ -8635,7 +8636,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8700,7 +8701,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8725,58 +8726,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,82,45,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8807,36 +8808,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -8851,44 +8852,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -8911,48 +8912,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="21KM" filter="&quot;distance&quot; = '21KM'" symbol="0" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule label="10KM" filter="&quot;distance&quot; = '10KM'" symbol="1" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule label="5KM" filter="&quot;distance&quot; = '5KM'" symbol="2" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM" description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'"/>
+          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM" description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'"/>
+          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM" description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8972,40 +8973,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="miter"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0.5"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="area"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="miter"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="210,32,39,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="area"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -9028,32 +9029,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9073,44 +9074,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -9126,32 +9127,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@0@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@0@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -9166,9 +9167,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9176,35 +9177,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9235,39 +9236,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9287,44 +9288,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -9340,32 +9341,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.5"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -9380,9 +9381,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9390,24 +9391,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9427,44 +9428,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -9480,32 +9481,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -9520,9 +9521,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9530,35 +9531,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9589,39 +9590,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9641,44 +9642,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="69,100,25,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9694,32 +9695,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@2@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="69,100,25,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="69,100,25,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.5"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="69,100,25,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9734,9 +9735,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9744,24 +9745,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9781,44 +9782,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="69,100,25,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9834,32 +9835,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@2@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@2@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="69,100,25,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9874,9 +9875,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9884,35 +9885,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="69,100,25,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="69,100,25,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9943,74 +9944,74 @@ 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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -10041,9 +10042,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10051,65 +10052,65 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="Distance" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Distance" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Distance" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="Distance" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="Distance" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="id" hidden="0" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10141,17 +10142,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -10172,7 +10173,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -10245,58 +10246,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="125,139,143,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -10327,36 +10328,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -10371,44 +10372,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -10431,46 +10432,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="marker" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="0.796078">
+          <symbol alpha="0.796078" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="227,0,185,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="1"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="227,0,185,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -10493,15 +10494,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10512,34 +10513,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 key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="8" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="8" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.40000000000000002" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0.20000000000000001" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -10554,151 +10555,151 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="8" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="1" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="8" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="4" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="227,0,185,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="227,0,185,255" fontSize="4" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.10000000000000001" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -10713,89 +10714,89 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="2" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="2" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -10804,194 +10805,194 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/angleOffset" value="0"/>
-          <Option type="QString" name="labeling/blendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferColorA" value="255"/>
-          <Option type="QString" name="labeling/bufferColorB" value="255"/>
-          <Option type="QString" name="labeling/bufferColorG" value="255"/>
-          <Option type="QString" name="labeling/bufferColorR" value="255"/>
-          <Option type="QString" name="labeling/bufferDraw" value="false"/>
-          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
-          <Option type="QString" name="labeling/bufferSize" value="1"/>
-          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/bufferTransp" value="0"/>
-          <Option type="QString" name="labeling/centroidInside" value="false"/>
-          <Option type="QString" name="labeling/centroidWhole" value="false"/>
-          <Option type="QString" name="labeling/decimals" value="3"/>
-          <Option type="QString" name="labeling/displayAll" value="false"/>
-          <Option type="QString" name="labeling/dist" value="0"/>
-          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/drawLabels" value="false"/>
-          <Option type="QString" name="labeling/enabled" value="false"/>
-          <Option type="QString" name="labeling/fieldName" value="position"/>
-          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
-          <Option type="QString" name="labeling/fontCapitals" value="0"/>
-          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
-          <Option type="QString" name="labeling/fontItalic" value="false"/>
-          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
-          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
-          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
-          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
-          <Option type="QString" name="labeling/fontSize" value="10"/>
-          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
-          <Option type="QString" name="labeling/fontUnderline" value="false"/>
-          <Option type="QString" name="labeling/fontWeight" value="63"/>
-          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
-          <Option type="QString" name="labeling/formatNumbers" value="false"/>
-          <Option type="QString" name="labeling/isExpression" value="false"/>
-          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
-          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/labelPerPart" value="false"/>
-          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
-          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
-          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
-          <Option type="QString" name="labeling/mergeLines" value="false"/>
-          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
-          <Option type="QString" name="labeling/multilineAlign" value="0"/>
-          <Option type="QString" name="labeling/multilineHeight" value="1"/>
-          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
-          <Option type="QString" name="labeling/obstacle" value="true"/>
-          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
-          <Option type="QString" name="labeling/obstacleType" value="0"/>
-          <Option type="QString" name="labeling/offsetType" value="0"/>
-          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
-          <Option type="QString" name="labeling/placement" value="0"/>
-          <Option type="QString" name="labeling/placementFlags" value="10"/>
-          <Option type="QString" name="labeling/plussign" value="false"/>
-          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option type="QString" name="labeling/preserveRotation" value="true"/>
-          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
-          <Option type="QString" name="labeling/priority" value="5"/>
-          <Option type="QString" name="labeling/quadOffset" value="4"/>
-          <Option type="QString" name="labeling/repeatDistance" value="0"/>
-          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
-          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
-          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
-          <Option type="QString" name="labeling/scaleMin" value="1"/>
-          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
-          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
-          <Option type="QString" name="labeling/shadowColorB" value="0"/>
-          <Option type="QString" name="labeling/shadowColorG" value="0"/>
-          <Option type="QString" name="labeling/shadowColorR" value="0"/>
-          <Option type="QString" name="labeling/shadowDraw" value="false"/>
-          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
-          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
-          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
-          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
-          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
-          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowScale" value="100"/>
-          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
-          <Option type="QString" name="labeling/shadowUnder" value="0"/>
-          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeDraw" value="true"/>
-          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
-          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
-          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
-          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
-          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
-          <Option type="QString" name="labeling/shapeRotation" value="0"/>
-          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
-          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
-          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
-          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
-          <Option type="QString" name="labeling/shapeType" value="0"/>
-          <Option type="QString" name="labeling/textColorA" value="255"/>
-          <Option type="QString" name="labeling/textColorB" value="255"/>
-          <Option type="QString" name="labeling/textColorG" value="255"/>
-          <Option type="QString" name="labeling/textColorR" value="255"/>
-          <Option type="QString" name="labeling/textTransp" value="0"/>
-          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
-          <Option type="QString" name="labeling/wrapChar" value=""/>
-          <Option type="QString" name="labeling/xOffset" value="0"/>
-          <Option type="QString" name="labeling/yOffset" value="0"/>
-          <Option type="QString" name="labeling/zIndex" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -11022,9 +11023,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11032,83 +11033,83 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="10" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="10" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="position" index="1"/>
-        <alias name="" field="type" index="2"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="position" desc=""/>
-        <constraint exp="" field="type" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="position" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11184,7 +11185,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Polygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11249,7 +11250,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11278,58 +11279,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="164,113,88,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -11360,36 +11361,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -11404,44 +11405,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -11464,38 +11465,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,85,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,85,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="b_diagonal"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,85,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,85,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,85,0,255" k="color"/>
@@ -11510,9 +11511,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11523,62 +11524,62 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -11609,9 +11610,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11619,64 +11620,64 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="1" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option type="double" name="allowedGapsBuffer" value="0"/>
-            <Option type="bool" name="allowedGapsEnabled" value="false"/>
-            <Option type="QString" name="allowedGapsLayer" value=""/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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">
+        <field configurationFlags="None" name="day">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -11685,50 +11686,50 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="name" index="0"/>
-        <alias name="" field="group" index="1"/>
-        <alias name="" field="type" index="2"/>
-        <alias name="" field="day" index="3"/>
-        <alias name="" field="cone_len" index="4"/>
-        <alias name="" field="fence_len" index="5"/>
+        <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=""/>
       </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"/>
-        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="group" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="cone_len" desc=""/>
-        <constraint exp="" field="fence_len" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="name" hidden="0" width="415"/>
-          <column type="field" name="group" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="cone_len" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="fence_len" hidden="0" width="-1"/>
+          <column hidden="0" name="name" type="field" width="415"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="cone_len" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="fence_len" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11760,12 +11761,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="cone_len" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="fence_len" editable="1"/>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <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 labelOnTop="0" name="cone_len"/>
@@ -11776,19 +11777,19 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11853,7 +11854,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11867,26 +11868,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" type="6" subType="0" precision="0" typeName="double precision"/>
+        <field comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" precision="0" type="6" typeName="double precision" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" minScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" simplifyAlgorithm="0" version="3.8.3-Zanzibar" readOnly="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" maxScale="0">
+          <qgis version="3.8.3-Zanzibar" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" maxScale="0" minScale="1e+08" simplifyDrawingTol="1" labelsEnabled="1" simplifyLocal="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
+            <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" type="RuleRenderer">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol force_rhr="0" name="0" type="line" clip_to_extent="1" alpha="1">
-                  <layer pass="0" locked="0" class="SimpleLine" enabled="1">
+                <symbol alpha="1" force_rhr="0" clip_to_extent="1" name="0" type="line">
+                  <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -11916,17 +11917,17 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontUnderline="0" textOpacity="0.8" blendMode="0" fontWeight="50" fontFamily="Myriad Pro" fontStrikeout="0" namedStyle="Regular" fontLetterSpacing="0" fontSize="11" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fieldName="comment" useSubstitutions="0" isExpression="0" fontCapitals="0" multilineHeight="1" fontSizeUnit="Point">
-                      <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferNoFill="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                      <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0.6" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="255,255,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeOpacity="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeSizeUnit="MM"/>
-                      <shadow shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                    <text-style namedStyle="Regular" textColor="0,0,0,255" fontSize="11" fieldName="comment" useSubstitutions="0" multilineHeight="1" textOpacity="0.8" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50">
+                      <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferBlendMode="0" bufferColor="255,255,255,255" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                      <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeSizeY="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeOpacity="0.6" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeOffsetUnit="MM"/>
+                      <shadow shadowOpacity="0.7" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="4294967295" decimals="3" plussign="0" formatNumbers="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                    <placement rotationAngle="0" quadOffset="4" repeatDistance="0" offsetType="0" priority="5" geometryGenerator="" xOffset="0" maxCurvedCharAngleOut="-25" dist="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" preserveRotation="1" offsetUnits="MM" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="4" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" centroidWhole="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM"/>
-                    <rendering drawLabels="1" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="1" obstacleType="0" displayAll="1" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                    <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="4294967295"/>
+                    <placement priority="5" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" xOffset="0" placement="4" distUnits="MM" repeatDistance="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" geometryGeneratorType="PointGeometry" rotationAngle="0" offsetUnits="MM" centroidInside="0" repeatDistanceUnits="MM" dist="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" placementFlags="2" quadOffset="4" centroidWhole="0" offsetType="0" maxCurvedCharAngleOut="-25"/>
+                    <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="1" displayAll="1" upsidedownLabels="0" obstacle="1" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" type="QString" value=""/>
@@ -11947,17 +11948,17 @@ def my_form_open(dialog, layer, feature):
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontUnderline="0" textOpacity="1" blendMode="0" fontWeight="63" fontFamily="Myriad Pro" fontStrikeout="0" namedStyle="Semibold" fontLetterSpacing="0" fontSize="12" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fieldName="round( $length, 1) || 'm'" useSubstitutions="0" isExpression="1" fontCapitals="0" multilineHeight="1" fontSizeUnit="Point">
-                      <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferNoFill="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                      <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeSizeUnit="MM"/>
-                      <shadow shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                    <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSize="12" fieldName="round( $length, 1) || 'm'" useSubstitutions="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63">
+                      <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferBlendMode="0" bufferColor="255,255,255,255" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                      <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM"/>
+                      <shadow shadowOpacity="0.7" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="4294967295" decimals="3" plussign="0" formatNumbers="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                    <placement rotationAngle="0" quadOffset="4" repeatDistance="0" offsetType="0" priority="5" geometryGenerator="" xOffset="0" maxCurvedCharAngleOut="-25" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" preserveRotation="1" offsetUnits="MM" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" centroidWhole="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM"/>
-                    <rendering drawLabels="1" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" displayAll="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                    <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="4294967295"/>
+                    <placement priority="5" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" xOffset="0" placement="2" distUnits="MM" repeatDistance="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" geometryGeneratorType="PointGeometry" rotationAngle="0" offsetUnits="MM" centroidInside="0" repeatDistanceUnits="MM" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" placementFlags="15" quadOffset="4" centroidWhole="0" offsetType="0" maxCurvedCharAngleOut="-25"/>
+                    <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" displayAll="0" upsidedownLabels="0" obstacle="1" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" type="QString" value=""/>
@@ -11981,8 +11982,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -11990,12 +11991,12 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" barWidth="5" minimumSize="0" backgroundAlpha="255" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" rotationOffset="270" minScaleDenominator="0" penColor="#000000" scaleDependency="Area" maxScaleDenominator="1e+08" opacity="1">
+              <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" lineSizeType="MM" penWidth="0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" penColor="#000000" diagramOrientation="Up" penAlpha="255" backgroundAlpha="255" barWidth="5">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" field="" color="#000000"/>
+                <attribute color="#000000" field="" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2">
+            <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
               <properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -12004,7 +12005,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -12088,81 +12089,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias name="" field="id" index="0"/>
-              <alias name="" field="group" index="1"/>
-              <alias name="" field="comment" index="2"/>
-              <alias name="" field="moveable" index="3"/>
-              <alias name="" field="type" index="4"/>
-              <alias name="" field="name" index="5"/>
-              <alias name="" field="hidden" index="6"/>
-              <alias name="" field="auxiliary_storage_labeling_positiony" index="7"/>
-              <alias name="" field="auxiliary_storage_labeling_positionx" index="8"/>
-              <alias name="" field="fence_len" index="9"/>
-              <alias name="" field="cone_len" index="10"/>
+              <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=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <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"/>
+              <default field="id" expression="" applyOnUpdate="0"/>
+              <default field="group" expression="" applyOnUpdate="0"/>
+              <default field="comment" expression="" applyOnUpdate="0"/>
+              <default field="moveable" expression="" applyOnUpdate="0"/>
+              <default field="type" expression="" applyOnUpdate="0"/>
+              <default field="name" expression="" applyOnUpdate="0"/>
+              <default field="hidden" expression="" applyOnUpdate="0"/>
+              <default field="auxiliary_storage_labeling_positiony" expression="" applyOnUpdate="0"/>
+              <default field="auxiliary_storage_labeling_positionx" expression="" applyOnUpdate="0"/>
+              <default field="fence_len" expression="" applyOnUpdate="0"/>
+              <default field="cone_len" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="comment" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="moveable" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="hidden" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="comment" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="moveable" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="hidden" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint exp="" field="id" desc=""/>
-              <constraint exp="" field="group" desc=""/>
-              <constraint exp="" field="comment" desc=""/>
-              <constraint exp="" field="moveable" desc=""/>
-              <constraint exp="" field="type" desc=""/>
-              <constraint exp="" field="name" desc=""/>
-              <constraint exp="" field="hidden" desc=""/>
-              <constraint exp="" field="auxiliary_storage_labeling_positiony" desc=""/>
-              <constraint exp="" field="auxiliary_storage_labeling_positionx" desc=""/>
-              <constraint exp="" field="fence_len" desc=""/>
-              <constraint exp="" field="cone_len" desc=""/>
+              <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=""/>
             </constraintExpressions>
             <expressionfields>
-              <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-              <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-              <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" type="6" subType="0" precision="0" typeName="double precision"/>
+              <field comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" name="fence_len" type="6" typeName="double precision" subType="0"/>
+              <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" name="fence_len" type="6" typeName="double precision" subType="0"/>
+              <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" name="cone_len" type="6" typeName="double precision" subType="0"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
               <columns>
-                <column name="id" type="field" hidden="0" width="-1"/>
-                <column name="group" type="field" hidden="0" width="-1"/>
-                <column type="actions" hidden="1" width="-1"/>
-                <column name="comment" type="field" hidden="0" width="223"/>
-                <column name="moveable" type="field" hidden="0" width="-1"/>
-                <column name="type" type="field" hidden="0" width="-1"/>
-                <column name="name" type="field" hidden="0" width="414"/>
-                <column name="hidden" type="field" hidden="0" width="-1"/>
-                <column name="fence_len" type="field" hidden="0" width="-1"/>
-                <column name="cone_len" type="field" hidden="0" width="-1"/>
-                <column name="auxiliary_storage_labeling_positiony" type="field" hidden="1" width="-1"/>
-                <column name="auxiliary_storage_labeling_positionx" type="field" hidden="1" width="-1"/>
+                <column hidden="0" name="id" width="-1" type="field"/>
+                <column hidden="0" name="group" width="-1" type="field"/>
+                <column hidden="1" width="-1" type="actions"/>
+                <column hidden="0" name="comment" width="223" type="field"/>
+                <column hidden="0" name="moveable" width="-1" type="field"/>
+                <column hidden="0" name="type" width="-1" type="field"/>
+                <column hidden="0" name="name" width="414" type="field"/>
+                <column hidden="0" name="hidden" width="-1" type="field"/>
+                <column hidden="0" name="fence_len" width="-1" type="field"/>
+                <column hidden="0" name="cone_len" width="-1" type="field"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positiony" width="-1" type="field"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positionx" width="-1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -12193,18 +12194,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-              <field name="comment" editable="1"/>
-              <field name="cone_len" editable="0"/>
-              <field name="fence_len" editable="0"/>
-              <field name="group" editable="1"/>
-              <field name="hidden" editable="1"/>
-              <field name="id" editable="1"/>
-              <field name="length" editable="0"/>
-              <field name="moveable" editable="1"/>
-              <field name="name" editable="1"/>
-              <field name="type" editable="1"/>
+              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+              <field editable="1" name="comment"/>
+              <field editable="0" name="cone_len"/>
+              <field editable="0" name="fence_len"/>
+              <field editable="1" name="group"/>
+              <field editable="1" name="hidden"/>
+              <field editable="1" name="id"/>
+              <field editable="0" name="length"/>
+              <field editable="1" name="moveable"/>
+              <field editable="1" name="name"/>
+              <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -12235,58 +12236,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="133,182,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="133,182,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12317,36 +12318,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -12361,44 +12362,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -12421,64 +12422,64 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="1" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="1" type="RuleRenderer">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule label="Cones" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule label="Moveable fences" 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" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule label="Fixed fences" 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" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule label="Construction" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
           </rule>
-          <rule checkstate="0" label="Is Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="4" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule key="{7917c389-04f8-48d5-ab53-8783abd3803e}" symbol="4" label="Is Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="round"/>
-                <Option type="QString" name="customdash" value="1;4"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="Point"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="dot"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="1;4"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="Point"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dot"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -12509,56 +12510,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="round"/>
-                <Option type="QString" name="customdash" value="4;3"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="4;3"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -12589,56 +12590,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.8"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12669,56 +12670,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="3" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.8"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12749,56 +12750,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="4" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="4" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12829,50 +12830,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="5" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="5" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="213,180,60,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12903,9 +12904,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12914,34 +12915,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
+          <rule key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.80000000000000004" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="11" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="comment" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="11" capitalization="0" fieldName="comment" multilineHeight="1" useSubstitutions="0" textOpacity="0.80000000000000004" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0.59999999999999998" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="255,255,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeSizeY="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="0.59999999999999998" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="255,255,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.6"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="255,255,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.6"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12956,118 +12957,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                        <Option type="int" name="type" value="2"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="4294967295" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="14" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8200000000000001" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="1" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="4294967295"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="5" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="1" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1.8200000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" description="Fence lengths" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
+          <rule key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="11" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="11" capitalization="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="196,60,57,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -13090,34 +13091,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -13132,112 +13133,112 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="6" placementFlags="14" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="6" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="1"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" description="Cones lengths" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
+          <rule key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="11" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="11" capitalization="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="196,60,57,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -13260,34 +13261,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -13302,112 +13303,112 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="6" placementFlags="14" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="6" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="1"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
+          <rule key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="11" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="11" capitalization="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="196,60,57,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -13430,34 +13431,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -13472,72 +13473,72 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="6" placementFlags="14" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="6" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="1"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -13546,62 +13547,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="&quot;id&quot;"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -13632,9 +13633,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13642,86 +13643,86 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -13730,74 +13731,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="group" index="1"/>
-        <alias name="" field="comment" index="2"/>
-        <alias name="" field="moveable" index="3"/>
-        <alias name="" field="type" index="4"/>
-        <alias name="" field="name" index="5"/>
-        <alias name="" field="hidden" index="6"/>
-        <alias name="" field="day" index="7"/>
-        <alias name="" field="fence_len" index="8"/>
-        <alias name="" field="cone_len" index="9"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="comment" expression="" applyOnUpdate="0"/>
+        <default field="moveable" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="hidden" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="comment" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="moveable" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="hidden" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="comment" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="moveable" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="hidden" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="group" desc=""/>
-        <constraint exp="" field="comment" desc=""/>
-        <constraint exp="" field="moveable" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="hidden" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="fence_len" desc=""/>
-        <constraint exp="" field="cone_len" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" type="6" subType="0" precision="0" typeName="double precision"/>
+        <field comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" precision="0" type="6" typeName="double precision" subType="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="group" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="comment" hidden="0" width="373"/>
-          <column type="field" name="moveable" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="name" hidden="0" width="316"/>
-          <column type="field" name="hidden" hidden="0" width="-1"/>
-          <column type="field" name="fence_len" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="cone_len" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="comment" type="field" width="373"/>
+          <column hidden="0" name="moveable" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="316"/>
+          <column hidden="0" name="hidden" type="field" width="-1"/>
+          <column hidden="0" name="fence_len" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="cone_len" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13829,19 +13830,19 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="comment" editable="1"/>
-        <field name="cone_len" editable="0"/>
-        <field name="day" editable="1"/>
-        <field name="fence_len" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="hidden" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length" editable="0"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="comment"/>
+        <field editable="0" name="cone_len"/>
+        <field editable="1" name="day"/>
+        <field editable="0" name="fence_len"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="hidden"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="length"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -13859,23 +13860,23 @@ def my_form_open(dialog, layer, feature):
         <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 maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13948,58 +13949,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="164,113,88,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14030,36 +14031,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -14074,44 +14075,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14134,54 +14135,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,178,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,178,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14212,9 +14213,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14225,60 +14226,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -14309,9 +14310,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14319,23 +14320,23 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -14344,25 +14345,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
+        <alias field="id" index="0" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
+        <constraint field="id" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14394,7 +14395,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -14405,7 +14406,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="MultiPolygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -14478,58 +14479,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="213,180,60,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14560,36 +14561,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="213,180,60,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="152,129,43,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="213,180,60,255" k="color"/>
@@ -14604,44 +14605,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="213,180,60,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="152,129,43,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14664,38 +14665,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="26,0,201,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="dot"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="b_diagonal"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="26,0,201,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="dot"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="26,0,201,255" k="color"/>
@@ -14710,9 +14711,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14723,10 +14724,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
@@ -14738,56 +14739,56 @@ def my_form_open(dialog, layer, feature):
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -14818,9 +14819,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14828,59 +14829,59 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option type="bool" name="active" value="true"/>
-                <Option type="QString" name="field" value="id"/>
-                <Option type="int" name="type" value="2"/>
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option name="active" type="bool" value="true"/>
+                <Option name="field" type="QString" value="id"/>
+                <Option name="type" type="int" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -14889,40 +14890,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
-        <alias name="" field="page" index="2"/>
-        <alias name="" field="day" index="3"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="page" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="page" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="page" desc=""/>
-        <constraint exp="" field="day" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;page&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="page" hidden="0" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="page" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14954,9 +14955,9 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="page" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="page"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -14969,7 +14970,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -15034,7 +15035,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15045,13 +15046,14 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join joinLayerId="marshals_by_position20161003112326575" memoryCache="0" cascadedDelete="0" hasCustomPrefix="1" customPrefix="csv_" upsertOnEdit="0" dynamicForm="0" joinFieldName="position" targetFieldName="position" editable="0">
+        <join editable="0" upsertOnEdit="0" cascadedDelete="0" hasCustomPrefix="1" memoryCache="1" customPrefix="csv_" targetFieldName="position" dynamicForm="0" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position">
           <joinFieldsSubset>
+            <field name="day"/>
             <field name="position"/>
             <field name="club"/>
-            <field name="firstname"/>
-            <field name="surname"/>
-            <field name="days"/>
+            <field name="captain"/>
+            <field name="captain_phone"/>
+            <field name="race"/>
             <field name="first_runner"/>
             <field name="last_runner"/>
             <field name="instructions"/>
@@ -15072,58 +15074,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="id" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="id" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="114,155,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="114,155,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -15154,36 +15156,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="81,111,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -15198,44 +15200,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="81,111,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -15258,51 +15260,51 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule label="Show by day in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule checkstate="0" label="Always show in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule checkstate="0" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0" label="Show by day in marshal plan" description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1" label="Always show in marshal plan" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
+          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2" label="Show in marshal maps" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="0.8">
+          <symbol alpha="0.8" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="Pixel"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -15325,42 +15327,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="0.8">
+          <symbol alpha="0.8" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="Pixel"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -15383,42 +15385,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="0.01">
+          <symbol alpha="0.01" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="0.1"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -15441,9 +15443,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15451,43 +15453,43 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </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}">
+        <rules key="{e2cfe0de-49d9-4c26-9f28-7c441fcd9406}">
+          <rule key="{6554fdac-c88c-4a54-906c-4410d068210b}" 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; )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="6" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="6" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.10000000000000001" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="231,113,72,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -15510,34 +15512,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15552,118 +15554,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="2" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="2" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0" key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}">
+          <rule key="{a4dd1032-0030-4a6b-9402-5837f38a97d7}" active="0" 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')">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="6" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="6" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.10000000000000001" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="231,113,72,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -15686,34 +15688,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15728,110 +15730,110 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="2" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="2" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}">
+          <rule key="{9c1b3f4f-60f7-4728-a973-105f4a2bf2a9}" active="0" 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' )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.5" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="6" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="6" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.5" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.40000000000000002" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0.20000000000000001" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15846,189 +15848,189 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                        <Option type="int" name="type" value="3"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="AlwaysShow" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="FontOpacity">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="FontOpacity" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="ShapeOpacity" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="8" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" zIndex="5" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="1"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="8" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="5" fontLimitPixelSize="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" 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 key="{0a116ab9-23e3-44ab-a89c-47d8c9d3bbc7}" 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; )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.59999999999999998" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="6" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="6" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.59999999999999998" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.40000000000000002" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0.20000000000000001" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.59999999999999998" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -16051,34 +16053,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -16093,148 +16095,148 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="8" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" zIndex="5" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="1"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="8" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="5" fontLimitPixelSize="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" 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 key="{5fea8fd6-270f-470f-9388-15325712ca1d}" 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">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="8" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="8" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.40000000000000002" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,0,255" shapeOpacity="0.90000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,0,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0.20000000000000001" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.90000000000000002" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="133,182,111,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="133,182,111,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -16257,34 +16259,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,0,255" k="color"/>
@@ -16299,108 +16301,108 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="0" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" zIndex="10" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="1"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="10" fontLimitPixelSize="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -16409,206 +16411,197 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/angleOffset" value="0"/>
-          <Option type="QString" name="labeling/blendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferColorA" value="255"/>
-          <Option type="QString" name="labeling/bufferColorB" value="255"/>
-          <Option type="QString" name="labeling/bufferColorG" value="255"/>
-          <Option type="QString" name="labeling/bufferColorR" value="255"/>
-          <Option type="QString" name="labeling/bufferDraw" value="false"/>
-          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
-          <Option type="QString" name="labeling/bufferSize" value="1"/>
-          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/bufferTransp" value="0"/>
-          <Option type="QString" name="labeling/centroidInside" value="false"/>
-          <Option type="QString" name="labeling/centroidWhole" value="false"/>
-          <Option type="QString" name="labeling/decimals" value="3"/>
-          <Option type="QString" name="labeling/displayAll" value="false"/>
-          <Option type="QString" name="labeling/dist" value="0"/>
-          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/drawLabels" value="false"/>
-          <Option type="QString" name="labeling/enabled" value="false"/>
-          <Option type="QString" name="labeling/fieldName" value="position"/>
-          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
-          <Option type="QString" name="labeling/fontCapitals" value="0"/>
-          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
-          <Option type="QString" name="labeling/fontItalic" value="false"/>
-          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
-          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
-          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
-          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
-          <Option type="QString" name="labeling/fontSize" value="10"/>
-          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
-          <Option type="QString" name="labeling/fontUnderline" value="false"/>
-          <Option type="QString" name="labeling/fontWeight" value="63"/>
-          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
-          <Option type="QString" name="labeling/formatNumbers" value="false"/>
-          <Option type="QString" name="labeling/isExpression" value="false"/>
-          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
-          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/labelPerPart" value="false"/>
-          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
-          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
-          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
-          <Option type="QString" name="labeling/mergeLines" value="false"/>
-          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
-          <Option type="QString" name="labeling/multilineAlign" value="0"/>
-          <Option type="QString" name="labeling/multilineHeight" value="1"/>
-          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
-          <Option type="QString" name="labeling/obstacle" value="true"/>
-          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
-          <Option type="QString" name="labeling/obstacleType" value="0"/>
-          <Option type="QString" name="labeling/offsetType" value="0"/>
-          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
-          <Option type="QString" name="labeling/placement" value="0"/>
-          <Option type="QString" name="labeling/placementFlags" value="10"/>
-          <Option type="QString" name="labeling/plussign" value="false"/>
-          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option type="QString" name="labeling/preserveRotation" value="true"/>
-          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
-          <Option type="QString" name="labeling/priority" value="5"/>
-          <Option type="QString" name="labeling/quadOffset" value="4"/>
-          <Option type="QString" name="labeling/repeatDistance" value="0"/>
-          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
-          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
-          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
-          <Option type="QString" name="labeling/scaleMin" value="1"/>
-          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
-          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
-          <Option type="QString" name="labeling/shadowColorB" value="0"/>
-          <Option type="QString" name="labeling/shadowColorG" value="0"/>
-          <Option type="QString" name="labeling/shadowColorR" value="0"/>
-          <Option type="QString" name="labeling/shadowDraw" value="false"/>
-          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
-          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
-          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
-          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
-          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
-          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowScale" value="100"/>
-          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
-          <Option type="QString" name="labeling/shadowUnder" value="0"/>
-          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeDraw" value="true"/>
-          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
-          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
-          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
-          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
-          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
-          <Option type="QString" name="labeling/shapeRotation" value="0"/>
-          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
-          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
-          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
-          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
-          <Option type="QString" name="labeling/shapeType" value="0"/>
-          <Option type="QString" name="labeling/textColorA" value="255"/>
-          <Option type="QString" name="labeling/textColorB" value="255"/>
-          <Option type="QString" name="labeling/textColorG" value="255"/>
-          <Option type="QString" name="labeling/textColorR" value="255"/>
-          <Option type="QString" name="labeling/textTransp" value="0"/>
-          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
-          <Option type="QString" name="labeling/wrapChar" value=""/>
-          <Option type="QString" name="labeling/xOffset" value="0"/>
-          <Option type="QString" name="labeling/yOffset" value="0"/>
-          <Option type="QString" name="labeling/zIndex" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -16639,9 +16632,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16649,132 +16642,139 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="notes" configurationFlags="None">
+        <field configurationFlags="None" name="notes">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="xyposition" configurationFlags="None">
+        <field configurationFlags="None" name="xyposition">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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_day">
+          <editWidget type="CheckBox">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="csv_firstname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_captain">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_surname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_captain_phone">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_days" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="csv_first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_race">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_first_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_instructions" configurationFlags="None">
+        <field configurationFlags="None" name="csv_last_runner">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="csv_instructions">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -16783,90 +16783,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="position" index="1"/>
-        <alias name="" field="type" index="2"/>
-        <alias name="" field="notes" index="3"/>
-        <alias name="" field="xyposition" index="4"/>
-        <alias name="" field="day" index="5"/>
-        <alias name="" field="csv_position" index="6"/>
-        <alias name="" field="csv_club" index="7"/>
-        <alias name="" field="csv_firstname" index="8"/>
-        <alias name="" field="csv_surname" index="9"/>
-        <alias name="" field="csv_days" index="10"/>
-        <alias name="" field="csv_first_runner" index="11"/>
-        <alias name="" field="csv_last_runner" index="12"/>
-        <alias name="" field="csv_instructions" index="13"/>
+        <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_day" index="6" name=""/>
+        <alias field="csv_position" index="7" name=""/>
+        <alias field="csv_club" index="8" name=""/>
+        <alias field="csv_captain" index="9" name=""/>
+        <alias field="csv_captain_phone" index="10" name=""/>
+        <alias field="csv_race" index="11" name=""/>
+        <alias field="csv_first_runner" index="12" name=""/>
+        <alias field="csv_last_runner" index="13" name=""/>
+        <alias field="csv_instructions" index="14" name=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="notes" expression="" applyOnUpdate="0"/>
+        <default field="xyposition" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="csv_day" expression="" applyOnUpdate="0"/>
+        <default field="csv_position" expression="" applyOnUpdate="0"/>
+        <default field="csv_club" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="csv_race" expression="" applyOnUpdate="0"/>
+        <default field="csv_first_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_last_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="notes" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="xyposition" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_club" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_firstname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_surname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_days" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_first_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_last_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_instructions" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="notes" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="xyposition" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_position" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_club" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_captain" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_captain_phone" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_race" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_first_runner" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_last_runner" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_instructions" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="position" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="notes" desc=""/>
-        <constraint exp="" field="xyposition" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="csv_position" desc=""/>
-        <constraint exp="" field="csv_club" desc=""/>
-        <constraint exp="" field="csv_firstname" desc=""/>
-        <constraint exp="" field="csv_surname" desc=""/>
-        <constraint exp="" field="csv_days" desc=""/>
-        <constraint exp="" field="csv_first_runner" desc=""/>
-        <constraint exp="" field="csv_last_runner" desc=""/>
-        <constraint exp="" field="csv_instructions" desc=""/>
+        <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_day" desc="" exp=""/>
+        <constraint field="csv_position" desc="" exp=""/>
+        <constraint field="csv_club" desc="" exp=""/>
+        <constraint field="csv_captain" desc="" exp=""/>
+        <constraint field="csv_captain_phone" desc="" exp=""/>
+        <constraint field="csv_race" desc="" exp=""/>
+        <constraint field="csv_first_runner" desc="" exp=""/>
+        <constraint field="csv_last_runner" desc="" exp=""/>
+        <constraint field="csv_instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="position" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="notes" hidden="0" width="-1"/>
-          <column type="field" name="xyposition" hidden="0" width="-1"/>
-          <column type="field" name="csv_club" hidden="0" width="-1"/>
-          <column type="field" name="csv_first_runner" hidden="0" width="-1"/>
-          <column type="field" name="csv_last_runner" hidden="0" width="-1"/>
-          <column type="field" name="csv_firstname" hidden="0" width="-1"/>
-          <column type="field" name="csv_surname" hidden="0" width="-1"/>
-          <column type="field" name="csv_position" hidden="0" width="-1"/>
-          <column type="field" name="csv_days" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="csv_instructions" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="notes" type="field" width="-1"/>
+          <column hidden="0" name="xyposition" type="field" width="-1"/>
+          <column hidden="0" name="csv_day" type="field" width="-1"/>
+          <column hidden="0" name="csv_position" type="field" width="-1"/>
+          <column hidden="0" name="csv_club" type="field" width="-1"/>
+          <column hidden="0" name="csv_captain" type="field" width="-1"/>
+          <column hidden="0" name="csv_captain_phone" type="field" width="-1"/>
+          <column hidden="0" name="csv_race" type="field" width="-1"/>
+          <column hidden="0" name="csv_first_runner" type="field" width="-1"/>
+          <column hidden="0" name="csv_last_runner" type="field" width="-1"/>
+          <column hidden="0" name="csv_instructions" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16898,40 +16903,51 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="csv_10_distance" editable="0"/>
-        <field name="csv_21_distance" editable="0"/>
-        <field name="csv_Description" editable="0"/>
-        <field name="csv_capt_1" editable="1"/>
-        <field name="csv_captai" editable="1"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_email" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_captain_phone" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_days" editable="0"/>
-        <field name="csv_email" editable="0"/>
-        <field name="csv_first runner" editable="0"/>
-        <field name="csv_first_" editable="1"/>
-        <field name="csv_first_runner" editable="0"/>
-        <field name="csv_firstname" editable="0"/>
-        <field name="csv_instru" editable="1"/>
-        <field name="csv_instructions" editable="0"/>
-        <field name="csv_last runner" editable="0"/>
-        <field name="csv_last_r" editable="1"/>
-        <field name="csv_last_runner" editable="0"/>
-        <field name="csv_name" editable="0"/>
-        <field name="csv_phone" editable="0"/>
-        <field name="csv_positi" editable="1"/>
-        <field name="csv_position" editable="0"/>
-        <field name="csv_races" editable="0"/>
-        <field name="csv_surname" editable="0"/>
-        <field name="day" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="notes" editable="1"/>
-        <field name="oldpositio" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="xyposition" editable="1"/>
+        <field editable="0" name="csv_10_distance"/>
+        <field editable="0" name="csv_21_distance"/>
+        <field editable="0" name="csv_Description"/>
+        <field editable="1" name="csv_capt_1"/>
+        <field editable="1" name="csv_captai"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_email"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_captain_phone"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_day"/>
+        <field editable="0" name="csv_days"/>
+        <field editable="0" name="csv_email"/>
+        <field editable="0" name="csv_first runner"/>
+        <field editable="1" name="csv_first_"/>
+        <field editable="0" name="csv_first_runner"/>
+        <field editable="0" name="csv_firstname"/>
+        <field editable="1" name="csv_instru"/>
+        <field editable="0" name="csv_instructions"/>
+        <field editable="0" name="csv_last runner"/>
+        <field editable="1" name="csv_last_r"/>
+        <field editable="0" name="csv_last_runner"/>
+        <field editable="0" name="csv_name"/>
+        <field editable="0" name="csv_phone"/>
+        <field editable="1" name="csv_positi"/>
+        <field editable="0" name="csv_position"/>
+        <field editable="0" name="csv_race"/>
+        <field editable="0" name="csv_races"/>
+        <field editable="0" name="csv_surname"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="marshals_by_position_captain"/>
+        <field editable="0" name="marshals_by_position_captain_phone"/>
+        <field editable="0" name="marshals_by_position_club"/>
+        <field editable="0" name="marshals_by_position_day"/>
+        <field editable="0" name="marshals_by_position_first_runner"/>
+        <field editable="0" name="marshals_by_position_instructions"/>
+        <field editable="0" name="marshals_by_position_last_runner"/>
+        <field editable="0" name="marshals_by_position_position"/>
+        <field editable="0" name="marshals_by_position_race"/>
+        <field editable="1" name="notes"/>
+        <field editable="1" name="oldpositio"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="xyposition"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="csv_10_distance"/>
@@ -16944,6 +16960,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="csv_captain_number"/>
         <field labelOnTop="0" name="csv_captain_phone"/>
         <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_day"/>
         <field labelOnTop="0" name="csv_days"/>
         <field labelOnTop="0" name="csv_email"/>
         <field labelOnTop="0" name="csv_first runner"/>
@@ -16959,10 +16976,20 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="csv_phone"/>
         <field labelOnTop="0" name="csv_positi"/>
         <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_race"/>
         <field labelOnTop="0" name="csv_races"/>
         <field labelOnTop="0" name="csv_surname"/>
         <field labelOnTop="0" name="day"/>
         <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="marshals_by_position_captain"/>
+        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
+        <field labelOnTop="0" name="marshals_by_position_club"/>
+        <field labelOnTop="0" name="marshals_by_position_day"/>
+        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_instructions"/>
+        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_position"/>
+        <field labelOnTop="0" name="marshals_by_position_race"/>
         <field labelOnTop="0" name="notes"/>
         <field labelOnTop="0" name="oldpositio"/>
         <field labelOnTop="0" name="position"/>
@@ -16970,27 +16997,38 @@ def my_form_open(dialog, layer, feature):
         <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_day"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_race"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
+        <field reuseLastValue="0" name="marshals_by_position_club"/>
+        <field reuseLastValue="0" name="marshals_by_position_day"/>
+        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
+        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_position"/>
+        <field reuseLastValue="0" name="marshals_by_position_race"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -17040,24 +17078,24 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry" readOnly="0" refreshOnNotifyMessage="" geometry="No geometry" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" legendPlaceholderImage="" maxScale="100000">
+    <maplayer refreshOnNotifyMessage="" autoRefreshTime="0" maxScale="100000" minScale="1e+08" readOnly="0" wkbType="NoGeometry" autoRefreshEnabled="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" geometry="No geometry" type="vector" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
       <id>marshals_by_position20161003112326575</id>
-      <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
+      <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
         <value></value>
       </keywordList>
       <layername>marshals_by_position</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>
+          <wkt></wkt>
+          <proj4></proj4>
+          <srsid>0</srsid>
+          <srid>0</srid>
+          <authid></authid>
+          <description></description>
+          <projectionacronym></projectionacronym>
+          <ellipsoidacronym></ellipsoidacronym>
+          <geographicflag>false</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -17093,7 +17131,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17102,13 +17140,10 @@ def my_form_open(dialog, layer, feature):
           </temporal>
         </extent>
       </resourceMetadata>
-      <provider encoding="UTF-8">delimitedtext</provider>
+      <provider encoding="">delimitedtext</provider>
       <vectorjoins/>
       <layerDependencies/>
-      <dataDependencies>
-        <layer id="all_routes20170907054841602"/>
-        <layer id="marshal_positions20160930121322287"/>
-      </dataDependencies>
+      <dataDependencies/>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -17121,58 +17156,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="243,166,178,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17203,36 +17238,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="243,166,178,255" k="color"/>
@@ -17247,44 +17282,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17307,9 +17342,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17318,143 +17353,96 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="first_name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="first_name"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames"/>
+          <Option name="variableValues"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="position" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="club" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="firstname" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="surname" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="phone" configurationFlags="None">
+        <field configurationFlags="None" name="club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="email" configurationFlags="None">
+        <field configurationFlags="None" name="captain">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain" configurationFlags="None">
+        <field configurationFlags="None" name="captain_phone">
           <editWidget type="TextEdit">
             <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
+              <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="captain_phone" configurationFlags="None">
+        <field configurationFlags="None" name="race">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="captain_email" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="days" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="first_runner">
           <editWidget type="TextEdit">
             <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
+              <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="last_runner">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="distance">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runner" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="instructions" configurationFlags="None">
-          <editWidget type="">
+        <field configurationFlags="None" name="instructions">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -17462,94 +17450,75 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="position" index="0"/>
-        <alias name="" field="club" index="1"/>
-        <alias name="" field="firstname" index="2"/>
-        <alias name="" field="surname" index="3"/>
-        <alias name="" field="name" index="4"/>
-        <alias name="" field="phone" index="5"/>
-        <alias name="" field="email" index="6"/>
-        <alias name="" field="captain" index="7"/>
-        <alias name="" field="captain_phone" index="8"/>
-        <alias name="" field="captain_email" index="9"/>
-        <alias name="" field="days" index="10"/>
-        <alias name="" field="races" index="11"/>
-        <alias name="" field="first_runner" index="12"/>
-        <alias name="" field="last_runner" index="13"/>
-        <alias name="" field="instructions" index="14"/>
+        <alias field="day" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="club" index="2" name=""/>
+        <alias field="captain" index="3" name=""/>
+        <alias field="captain_phone" index="4" name=""/>
+        <alias field="race" index="5" name=""/>
+        <alias field="first_runner" index="6" name=""/>
+        <alias field="last_runner" index="7" name=""/>
+        <alias field="distance" index="8" name=""/>
+        <alias field="instructions" index="9" name=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="captain" expression="" applyOnUpdate="0"/>
+        <default field="captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="race" expression="" applyOnUpdate="0"/>
+        <default field="first_runner" expression="" applyOnUpdate="0"/>
+        <default field="last_runner" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="club" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="firstname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="surname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="phone" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="email" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain_phone" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain_email" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="days" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="races" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="first_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="last_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="instructions" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="club" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="captain" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="captain_phone" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="race" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="first_runner" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="last_runner" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="instructions" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="position" desc=""/>
-        <constraint exp="" field="club" desc=""/>
-        <constraint exp="" field="firstname" desc=""/>
-        <constraint exp="" field="surname" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="phone" desc=""/>
-        <constraint exp="" field="email" desc=""/>
-        <constraint exp="" field="captain" desc=""/>
-        <constraint exp="" field="captain_phone" desc=""/>
-        <constraint exp="" field="captain_email" desc=""/>
-        <constraint exp="" field="days" desc=""/>
-        <constraint exp="" field="races" desc=""/>
-        <constraint exp="" field="first_runner" desc=""/>
-        <constraint exp="" field="last_runner" desc=""/>
-        <constraint exp="" field="instructions" desc=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="club" desc="" exp=""/>
+        <constraint field="captain" desc="" exp=""/>
+        <constraint field="captain_phone" desc="" exp=""/>
+        <constraint field="race" desc="" exp=""/>
+        <constraint field="first_runner" desc="" exp=""/>
+        <constraint field="last_runner" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="position" hidden="0" width="-1"/>
-          <column type="field" name="name" hidden="0" width="221"/>
-          <column type="field" name="club" hidden="0" width="-1"/>
-          <column type="field" name="phone" hidden="0" width="-1"/>
-          <column type="field" name="email" hidden="0" width="-1"/>
-          <column type="field" name="captain" hidden="0" width="-1"/>
-          <column type="field" name="races" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="first_runner" hidden="0" width="-1"/>
-          <column type="field" name="last_runner" hidden="0" width="-1"/>
-          <column type="field" name="instructions" hidden="0" width="-1"/>
-          <column type="field" name="firstname" hidden="0" width="-1"/>
-          <column type="field" name="surname" hidden="0" width="-1"/>
-          <column type="field" name="captain_phone" hidden="0" width="-1"/>
-          <column type="field" name="captain_email" hidden="0" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="221"/>
+          <column hidden="0" name="club" type="field" width="-1"/>
+          <column hidden="0" name="phone" type="field" width="-1"/>
+          <column hidden="0" name="email" type="field" width="-1"/>
+          <column hidden="0" name="captain" type="field" width="-1"/>
+          <column hidden="0" name="races" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="first_runner" type="field" width="-1"/>
+          <column hidden="0" name="last_runner" type="field" width="-1"/>
+          <column hidden="0" name="instructions" type="field" width="-1"/>
+          <column hidden="0" name="firstname" type="field" width="-1"/>
+          <column hidden="0" name="surname" type="field" width="-1"/>
+          <column hidden="0" name="captain_phone" type="field" width="-1"/>
+          <column hidden="0" name="days" type="field" width="-1"/>
+          <column hidden="0" name="captain_email" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17581,34 +17550,43 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="10_distance" editable="1"/>
-        <field name="21_distance" editable="1"/>
-        <field name="5_distance" editable="1"/>
-        <field name="captain" editable="1"/>
-        <field name="captain_number" editable="1"/>
-        <field name="club" editable="1"/>
-        <field name="email" editable="1"/>
-        <field name="first_name" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="instructions" editable="1"/>
-        <field name="last_name" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="phone" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="tshirt" editable="1"/>
+        <field editable="1" name="10_distance"/>
+        <field editable="1" name="21_distance"/>
+        <field editable="1" name="5_distance"/>
+        <field editable="1" name="captain"/>
+        <field editable="1" name="captain_email"/>
+        <field editable="1" name="captain_number"/>
+        <field editable="1" name="captain_phone"/>
+        <field editable="1" name="club"/>
+        <field editable="1" name="days"/>
+        <field editable="1" name="email"/>
+        <field editable="1" name="first_name"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="firstname"/>
+        <field editable="1" name="instructions"/>
+        <field editable="1" name="last_name"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="phone"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="surname"/>
+        <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="10_distance"/>
         <field labelOnTop="0" name="21_distance"/>
         <field labelOnTop="0" name="5_distance"/>
         <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_email"/>
         <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="captain_phone"/>
         <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="days"/>
         <field labelOnTop="0" name="email"/>
         <field labelOnTop="0" name="first_name"/>
         <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="firstname"/>
         <field labelOnTop="0" name="instructions"/>
         <field labelOnTop="0" name="last_name"/>
         <field labelOnTop="0" name="last_runner"/>
@@ -17616,15 +17594,32 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="phone"/>
         <field labelOnTop="0" name="position"/>
         <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="surname"/>
         <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="captain"/>
+        <field reuseLastValue="0" name="captain_email"/>
+        <field reuseLastValue="0" name="captain_phone"/>
+        <field reuseLastValue="0" name="club"/>
+        <field reuseLastValue="0" name="days"/>
+        <field reuseLastValue="0" name="email"/>
+        <field reuseLastValue="0" name="first_runner"/>
+        <field reuseLastValue="0" name="firstname"/>
+        <field reuseLastValue="0" name="instructions"/>
+        <field reuseLastValue="0" name="last_runner"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="phone"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="surname"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -17689,7 +17684,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17714,58 +17709,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="141,90,153,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="141,90,153,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17796,36 +17791,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="141,90,153,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="101,64,109,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="141,90,153,255" k="color"/>
@@ -17840,44 +17835,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="141,90,153,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="101,64,109,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17900,58 +17895,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" filter="&quot;type&quot; IS 'car'" symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule label="Walking" filter="&quot;type&quot; IS 'walk'" symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car" filter="&quot;type&quot; IS 'car'"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="123,211,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17982,50 +17977,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="4;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1.25"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -18056,30 +18051,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -18099,33 +18094,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -18141,32 +18136,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -18181,9 +18176,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -18196,60 +18191,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18280,9 +18275,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18290,30 +18285,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -18322,30 +18317,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18377,8 +18372,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -18390,7 +18385,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -18455,7 +18450,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18480,58 +18475,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="232,113,141,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="232,113,141,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -18562,36 +18557,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="232,113,141,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="166,81,101,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="232,113,141,255" k="color"/>
@@ -18606,44 +18601,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="232,113,141,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="166,81,101,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -18666,44 +18661,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="0.75" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="8.5" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="name" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="8.5" capitalization="0" fieldName="name" multilineHeight="1" useSubstitutions="0" textOpacity="0.75" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="64" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1.5"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1.5" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -18718,158 +18713,158 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option type="int" name="type" value="3"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelRotation" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="PositionX">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="field" value="label_x"/>
-                    <Option type="int" name="type" value="2"/>
+                  <Option name="PositionX" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_x"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
-                  <Option type="Map" name="PositionY">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="field" value="label_y"/>
-                    <Option type="int" name="type" value="2"/>
+                  <Option name="PositionY" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_y"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                    <Option type="int" name="type" value="3"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="1" placementFlags="2" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="0.20000000000000001" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="1" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="0.20000000000000001"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;name&quot;"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18900,9 +18895,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18910,173 +18905,173 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="population" configurationFlags="None">
+        <field configurationFlags="None" name="population">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="osm_id" index="1"/>
-        <alias name="" field="name" index="2"/>
-        <alias name="" field="type" index="3"/>
-        <alias name="" field="z_order" index="4"/>
-        <alias name="" field="population" index="5"/>
-        <alias name="" field="label_x" index="6"/>
-        <alias name="" field="label_y" index="7"/>
-        <alias name="" field="label_rota" index="8"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="population" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="osm_id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="z_order" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="population" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_x" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_y" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_rota" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="osm_id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="z_order" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="population" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_x" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_y" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_rota" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="osm_id" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="z_order" desc=""/>
-        <constraint exp="" field="population" desc=""/>
-        <constraint exp="" field="label_x" desc=""/>
-        <constraint exp="" field="label_y" desc=""/>
-        <constraint exp="" field="label_rota" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="osm_id" hidden="0" width="-1"/>
-          <column type="field" name="name" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="z_order" hidden="0" width="-1"/>
-          <column type="field" name="population" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="label_x" hidden="0" width="-1"/>
-          <column type="field" name="label_y" hidden="0" width="-1"/>
-          <column type="field" name="label_rota" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="osm_id" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="z_order" type="field" width="-1"/>
+          <column hidden="0" name="population" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="label_x" type="field" width="-1"/>
+          <column hidden="0" name="label_y" type="field" width="-1"/>
+          <column hidden="0" name="label_rota" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19108,15 +19103,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="osm_id" editable="1"/>
-        <field name="population" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="population"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -19135,7 +19130,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -19200,7 +19195,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19225,58 +19220,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,158,23,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,158,23,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -19307,36 +19302,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,158,23,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="182,113,16,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,158,23,255" k="color"/>
@@ -19351,44 +19346,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,158,23,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="182,113,16,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19411,52 +19406,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="0.80000000000000004" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="7" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="7" capitalization="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="0.80000000000000004" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="196,60,57,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="196,60,57,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -19479,34 +19474,34 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -19521,107 +19516,107 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MapUnit" priority="3" placementFlags="4" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="3" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="0.29999999999999999" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="5" fontLimitPixelSize="0" mergeLines="1" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="4" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="3" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MapUnit" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="5" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="1" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="0.29999999999999999"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="always_sho"/>
-                  <Option type="int" name="type" value="2"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="always_sho"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="&quot;&quot;"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="&quot;&quot;"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="Priority" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="Show" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
@@ -19632,56 +19627,56 @@ def my_form_open(dialog, layer, feature):
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -19712,9 +19707,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19722,137 +19717,137 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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/>
@@ -19861,100 +19856,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="osm_id" index="0"/>
-        <alias name="" field="name" index="1"/>
-        <alias name="" field="highway" index="2"/>
-        <alias name="" field="waterway" index="3"/>
-        <alias name="" field="aerialway" index="4"/>
-        <alias name="" field="barrier" index="5"/>
-        <alias name="" field="man_made" index="6"/>
-        <alias name="" field="z_order" index="7"/>
-        <alias name="" field="other_tags" index="8"/>
-        <alias name="" field="never_show" index="9"/>
-        <alias name="" field="label_x" index="10"/>
-        <alias name="" field="label_y" index="11"/>
-        <alias name="" field="label_rota" index="12"/>
-        <alias name="" field="always_sho" index="13"/>
-        <alias name="" field="resident_a" index="14"/>
-        <alias name="" field="auxiliary_storage_labeling_show" index="15"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="highway" expression="" applyOnUpdate="0"/>
+        <default field="waterway" expression="" applyOnUpdate="0"/>
+        <default field="aerialway" expression="" applyOnUpdate="0"/>
+        <default field="barrier" expression="" applyOnUpdate="0"/>
+        <default field="man_made" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="other_tags" expression="" applyOnUpdate="0"/>
+        <default field="never_show" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
+        <default field="always_sho" expression="" applyOnUpdate="0"/>
+        <default field="resident_a" expression="" applyOnUpdate="0"/>
+        <default field="auxiliary_storage_labeling_show" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="osm_id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="highway" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="waterway" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="aerialway" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="barrier" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="man_made" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="z_order" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="other_tags" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="never_show" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_x" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_y" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_rota" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="always_sho" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="resident_a" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="osm_id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="highway" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="waterway" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="aerialway" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="barrier" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="man_made" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="z_order" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="other_tags" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="never_show" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_x" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_y" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_rota" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="always_sho" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="resident_a" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="auxiliary_storage_labeling_show" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="osm_id" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="highway" desc=""/>
-        <constraint exp="" field="waterway" desc=""/>
-        <constraint exp="" field="aerialway" desc=""/>
-        <constraint exp="" field="barrier" desc=""/>
-        <constraint exp="" field="man_made" desc=""/>
-        <constraint exp="" field="z_order" desc=""/>
-        <constraint exp="" field="other_tags" desc=""/>
-        <constraint exp="" field="never_show" desc=""/>
-        <constraint exp="" field="label_x" desc=""/>
-        <constraint exp="" field="label_y" desc=""/>
-        <constraint exp="" field="label_rota" desc=""/>
-        <constraint exp="" field="always_sho" desc=""/>
-        <constraint exp="" field="resident_a" desc=""/>
-        <constraint exp="" field="auxiliary_storage_labeling_show" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="osm_id" hidden="0" width="-1"/>
-          <column type="field" name="name" hidden="0" width="160"/>
-          <column type="field" name="z_order" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="highway" hidden="0" width="-1"/>
-          <column type="field" name="waterway" hidden="0" width="-1"/>
-          <column type="field" name="aerialway" hidden="0" width="-1"/>
-          <column type="field" name="barrier" hidden="0" width="-1"/>
-          <column type="field" name="man_made" hidden="0" width="-1"/>
-          <column type="field" name="other_tags" hidden="0" width="142"/>
-          <column type="field" name="never_show" hidden="0" width="-1"/>
-          <column type="field" name="label_x" hidden="0" width="-1"/>
-          <column type="field" name="label_y" hidden="0" width="-1"/>
-          <column type="field" name="label_rota" hidden="0" width="-1"/>
-          <column type="field" name="always_sho" hidden="0" width="-1"/>
-          <column type="field" name="resident_a" hidden="0" width="-1"/>
-          <column type="field" name="auxiliary_storage_labeling_show" hidden="0" width="-1"/>
+          <column hidden="0" name="osm_id" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="160"/>
+          <column hidden="0" name="z_order" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="highway" type="field" width="-1"/>
+          <column hidden="0" name="waterway" type="field" width="-1"/>
+          <column hidden="0" name="aerialway" type="field" width="-1"/>
+          <column hidden="0" name="barrier" type="field" width="-1"/>
+          <column hidden="0" name="man_made" type="field" width="-1"/>
+          <column hidden="0" name="other_tags" type="field" width="142"/>
+          <column hidden="0" name="never_show" type="field" width="-1"/>
+          <column hidden="0" name="label_x" type="field" width="-1"/>
+          <column hidden="0" name="label_y" type="field" width="-1"/>
+          <column hidden="0" name="label_rota" type="field" width="-1"/>
+          <column hidden="0" name="always_sho" type="field" width="-1"/>
+          <column hidden="0" name="resident_a" type="field" width="-1"/>
+          <column hidden="0" name="auxiliary_storage_labeling_show" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19986,40 +19981,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="aerialway" editable="1"/>
-        <field name="always_sho" editable="1"/>
-        <field name="auxiliary_storage_labeling_show" editable="0"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="0" name="auxiliary_storage_labeling_show"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="aerialway"/>
@@ -20058,22 +20053,22 @@ def my_form_open(dialog, layer, feature):
         <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>
@@ -20123,7 +20118,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -20188,7 +20183,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -20213,58 +20208,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="231,113,72,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="231,113,72,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -20295,36 +20290,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="231,113,72,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="165,81,51,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="231,113,72,255" k="color"/>
@@ -20339,44 +20334,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="231,113,72,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="165,81,51,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -20399,54 +20394,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="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}"/>
-          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1" filter="&quot;type&quot; = 'toilets'"/>
+          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2" filter="&quot;type&quot; = 'togbag'"/>
+          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3" filter=" &quot;type&quot; = 'closure'"/>
+          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4" filter="&quot;type&quot; = 'myciti'"/>
+          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="name" value="star"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.5"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="7"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="name" type="QString" value="star"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.5"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -20469,47 +20464,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,32,80,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="amenity/amenity_toilets.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,32,80,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="7"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,32,80,255" k="color"/>
@@ -20531,47 +20526,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="../images/gym-bag.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
@@ -20593,57 +20588,57 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="3" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="../images/road_closure.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/road_closure.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="125,139,143,255" k="color"/>
@@ -20665,47 +20660,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="4" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="4" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,12,254,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="transport/transport_bus_stop.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="255,255,255,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,12,254,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="255,255,255,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
@@ -20725,21 +20720,21 @@ def my_form_open(dialog, layer, feature):
               <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"/>
-              <effect type="effectStack" enabled="0">
+              <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="13"/>
-                    <Option type="QString" name="blur_level" value="2.645"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="offset_angle" value="135"/>
-                    <Option type="QString" name="offset_distance" value="2"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <Option name="blend_mode" type="QString" value="13"/>
+                    <Option name="blur_level" type="QString" value="2.645"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="offset_angle" type="QString" value="135"/>
+                    <Option name="offset_distance" type="QString" value="2"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -20756,24 +20751,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="blur_level" value="0.7935"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color1" value="0,0,255,255"/>
-                    <Option type="QString" name="color2" value="0,255,0,255"/>
-                    <Option type="QString" name="color_type" value="0"/>
-                    <Option type="QString" name="direction" value="ccw"/>
-                    <Option type="QString" name="discrete" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="1"/>
-                    <Option type="QString" name="opacity" value="0.5"/>
-                    <Option type="QString" name="rampType" value="gradient"/>
-                    <Option type="QString" name="single_color" value="255,255,255,255"/>
-                    <Option type="QString" name="spec" value="rgb"/>
-                    <Option type="QString" name="spread" value="2"/>
-                    <Option type="QString" name="spread_unit" value="MM"/>
-                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color1" type="QString" value="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="1"/>
+                    <Option name="opacity" type="QString" value="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <Option name="spread" type="QString" value="2"/>
+                    <Option name="spread_unit" type="QString" value="MM"/>
+                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20796,10 +20791,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="1"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="1"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -20808,18 +20803,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="13"/>
-                    <Option type="QString" name="blur_level" value="2.645"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="offset_angle" value="135"/>
-                    <Option type="QString" name="offset_distance" value="2"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <Option name="blend_mode" type="QString" value="13"/>
+                    <Option name="blur_level" type="QString" value="2.645"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="offset_angle" type="QString" value="135"/>
+                    <Option name="offset_distance" type="QString" value="2"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -20836,24 +20831,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="blur_level" value="0.7935"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color1" value="0,0,255,255"/>
-                    <Option type="QString" name="color2" value="0,255,0,255"/>
-                    <Option type="QString" name="color_type" value="0"/>
-                    <Option type="QString" name="direction" value="ccw"/>
-                    <Option type="QString" name="discrete" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="opacity" value="0.5"/>
-                    <Option type="QString" name="rampType" value="gradient"/>
-                    <Option type="QString" name="single_color" value="255,255,255,255"/>
-                    <Option type="QString" name="spec" value="rgb"/>
-                    <Option type="QString" name="spread" value="2"/>
-                    <Option type="QString" name="spread_unit" value="MM"/>
-                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color1" type="QString" value="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="opacity" type="QString" value="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <Option name="spread" type="QString" value="2"/>
+                    <Option name="spread_unit" type="QString" value="MM"/>
+                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20877,47 +20872,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="5" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="5" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="43,153,41,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="transport/amenity=parking.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="43,153,41,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
@@ -20939,15 +20934,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20956,32 +20951,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="name" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" fieldName="name" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="0.80000000000000004" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="2"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="2" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiY="2" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.69999999999999996" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="2" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="2" shapeOpacity="0.69999999999999996" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -20996,148 +20991,148 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelDistance">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                    <Option type="int" name="type" value="3"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelDistance" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="OffsetQuad">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="2"/>
-                    <Option type="int" name="type" value="3"/>
+                  <Option name="OffsetQuad" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="2"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                    <Option type="int" name="type" value="3"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" placement="0" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="2" dist="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="2" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" zIndex="10" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="3" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="2" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="2" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="3" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="10" fontLimitPixelSize="0" obstacleFactor="1.8"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="2"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="2"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -21168,9 +21163,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21178,44 +21173,44 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -21224,40 +21219,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
-        <alias name="" field="name" index="2"/>
-        <alias name="" field="distance" index="3"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="distance" index="3" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="distance" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="distance" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="name" hidden="0" width="-1"/>
-          <column type="field" name="distance" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21289,10 +21284,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="distance" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="distance"/>
@@ -21306,7 +21301,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -21379,58 +21374,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="152,125,183,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21461,36 +21456,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="109,89,131,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -21505,44 +21500,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="109,89,131,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -21565,42 +21560,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
+            <layer class="LinePatternFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="135"/>
-                <Option type="QString" name="clip_mode" value="during_render"/>
-                <Option type="QString" name="color" value="211,134,33,255"/>
-                <Option type="QString" name="coordinate_reference" value="feature"/>
-                <Option type="QString" name="distance" value="2"/>
-                <Option type="QString" name="distance_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="distance_unit" value="MM"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="135"/>
+                <Option name="clip_mode" type="QString" value="during_render"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="coordinate_reference" type="QString" value="feature"/>
+                <Option name="distance" type="QString" value="2"/>
+                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="distance_unit" type="QString" value="MM"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
               </Option>
               <prop v="135" k="angle"/>
               <prop v="during_render" k="clip_mode"/>
@@ -21619,48 +21614,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="line" name="@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@0" clip_to_extent="1" type="line" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="align_dash_pattern" value="0"/>
-                    <Option type="QString" name="capstyle" value="square"/>
-                    <Option type="QString" name="customdash" value="5;2"/>
-                    <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="customdash_unit" value="MM"/>
-                    <Option type="QString" name="dash_pattern_offset" value="0"/>
-                    <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                    <Option type="QString" name="draw_inside_polygon" value="0"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="line_color" value="211,134,33,255"/>
-                    <Option type="QString" name="line_style" value="solid"/>
-                    <Option type="QString" name="line_width" value="0.3"/>
-                    <Option type="QString" name="line_width_unit" value="MM"/>
-                    <Option type="QString" name="offset" value="0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="ring_filter" value="0"/>
-                    <Option type="QString" name="trim_distance_end" value="0"/>
-                    <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                    <Option type="QString" name="trim_distance_start" value="0"/>
-                    <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                    <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                    <Option type="QString" name="use_custom_dash" value="0"/>
-                    <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option name="align_dash_pattern" type="QString" value="0"/>
+                    <Option name="capstyle" type="QString" value="square"/>
+                    <Option name="customdash" type="QString" value="5;2"/>
+                    <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="customdash_unit" type="QString" value="MM"/>
+                    <Option name="dash_pattern_offset" type="QString" value="0"/>
+                    <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                    <Option name="draw_inside_polygon" type="QString" value="0"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="line_color" type="QString" value="211,134,33,255"/>
+                    <Option name="line_style" type="QString" value="solid"/>
+                    <Option name="line_width" type="QString" value="0.3"/>
+                    <Option name="line_width_unit" type="QString" value="MM"/>
+                    <Option name="offset" type="QString" value="0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="ring_filter" type="QString" value="0"/>
+                    <Option name="trim_distance_end" type="QString" value="0"/>
+                    <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                    <Option name="trim_distance_start" type="QString" value="0"/>
+                    <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                    <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                    <Option name="use_custom_dash" type="QString" value="0"/>
+                    <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop v="0" k="align_dash_pattern"/>
                   <prop v="square" k="capstyle"/>
@@ -21691,27 +21686,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 type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="211,134,33,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.46"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="no"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.46"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="no"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="211,134,33,255" k="color"/>
@@ -21726,9 +21721,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21739,60 +21734,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -21823,9 +21818,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21833,23 +21828,23 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="1" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="FID" configurationFlags="None">
+        <field configurationFlags="None" name="FID">
           <editWidget type="">
             <config>
               <Option/>
@@ -21858,26 +21853,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="FID" index="0"/>
+        <alias field="FID" index="0" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="FID"/>
+        <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="FID" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="FID" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="FID" desc=""/>
+        <constraint field="FID" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="431"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21909,8 +21904,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -21922,7 +21917,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21987,7 +21982,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22012,58 +22007,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,207,80,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,207,80,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22094,36 +22089,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,207,80,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,148,57,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,207,80,255" k="color"/>
@@ -22138,44 +22133,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,207,80,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,148,57,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -22198,61 +22193,61 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" filter="&quot;status&quot; = 'open'" symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule label="No Parking" filter="&quot;status&quot; = 'no-parking'" symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule label="One-Way" filter="&quot;status&quot; = 'one-way'" symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule label="Road Closures" filter="&quot;status&quot; = 'closure'" symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" label="Road Open" filter="&quot;status&quot; = 'open'"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" label="No Parking" filter="&quot;status&quot; = 'no-parking'"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" label="One-Way" filter="&quot;status&quot; = 'one-way'"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" label="Road Closures" filter="&quot;status&quot; = 'closure'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22283,50 +22278,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="2"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="2"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -22346,40 +22341,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,255,0,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0.5"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="1"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,255,0,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -22402,52 +22397,52 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="2;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash dot dot"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="2;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash dot dot"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22478,41 +22473,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="25"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -22532,46 +22527,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,255,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3.5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -22594,58 +22589,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="3" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="3;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="3;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22676,41 +22671,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="25"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -22730,46 +22725,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@3@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@3@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,255,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3.5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -22792,58 +22787,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="4" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="4" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22874,20 +22869,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22896,32 +22891,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="9" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="times" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="9" capitalization="0" fieldName="times" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -22936,116 +22931,116 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="4294967295" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="4294967295"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -23076,9 +23071,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23086,44 +23081,44 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -23132,40 +23127,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
-        <alias name="" field="status" index="2"/>
-        <alias name="" field="times" index="3"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="status" index="2" name=""/>
+        <alias field="times" index="3" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="status"/>
-        <default expression="" applyOnUpdate="0" field="times"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="status" expression="" applyOnUpdate="0"/>
+        <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="status" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="times" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="status" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="times" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="status" desc=""/>
-        <constraint exp="" field="times" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="status" desc="" exp=""/>
+        <constraint field="times" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="202"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="status" hidden="0" width="-1"/>
-          <column type="field" name="times" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="status" type="field" width="-1"/>
+          <column hidden="0" name="times" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23197,10 +23192,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="status" editable="1"/>
-        <field name="times" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="status"/>
+        <field editable="1" name="times"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -23214,7 +23209,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37569522835420344</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -23279,7 +23274,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23304,58 +23299,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -23386,36 +23381,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -23430,44 +23425,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -23490,54 +23485,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="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 key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}" 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; )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -23560,34 +23555,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -23602,138 +23597,138 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="3" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="3" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
+          <rule key="{1a82228c-f408-4c3d-bb8d-158713c47604}" description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -23756,34 +23751,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -23798,131 +23793,131 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="3" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="3" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" active="0" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}">
-            <rule filter="&quot;Source&quot; = '21KM'" description="21KM" active="0" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}">
+          <rule key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" active="0" description="21KM" filter="&quot;Source&quot; = '21KM'">
               <settings calloutType="simple">
-                <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+                <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                  <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="210,32,39,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                    <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                  <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="210,32,39,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="210,32,39,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="210,32,39,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="210,32,39,255" k="color"/>
@@ -23937,130 +23932,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="3" geometryGeneratorType="PointGeometry" offsetType="0"/>
-                <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="3" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" description="10KM" active="0" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}">
+            <rule key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" active="0" description="10KM" filter="&quot;Source&quot; = '10KM'">
               <settings calloutType="simple">
-                <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+                <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                  <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="103,34,144,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                    <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                  <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="103,34,144,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="103,34,144,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="103,34,144,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="103,34,144,255" k="color"/>
@@ -24075,130 +24070,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-                <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" description="5KM" active="0" key="{693188a6-ae99-4fd2-859f-1606793dda66}">
+            <rule key="{693188a6-ae99-4fd2-859f-1606793dda66}" active="0" description="5KM" filter="&quot;Source&quot; = '5KM'">
               <settings calloutType="simple">
-                <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+                <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                  <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="145,211,55,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                    <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                  <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="145,211,55,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="145,211,55,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="145,211,55,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="145,211,55,255" k="color"/>
@@ -24213,138 +24208,138 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-                <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = 'Trail'" description="Trail" active="0" key="{ba58e108-c24a-410e-9584-a7819af049ef}">
+            <rule key="{ba58e108-c24a-410e-9584-a7819af049ef}" active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'">
               <settings calloutType="simple">
-                <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+                <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                  <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="145,211,55,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                    <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                  <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="145,211,55,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                      <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="angle" value="0"/>
-                          <Option type="QString" name="cap_style" value="square"/>
-                          <Option type="QString" name="color" value="133,182,111,255"/>
-                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                          <Option type="QString" name="joinstyle" value="bevel"/>
-                          <Option type="QString" name="name" value="circle"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="0"/>
-                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="scale_method" value="diameter"/>
-                          <Option type="QString" name="size" value="2"/>
-                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="size_unit" value="MM"/>
-                          <Option type="QString" name="vertical_anchor_point" value="1"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="133,182,111,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <prop v="0" k="angle"/>
                         <prop v="square" k="cap_style"/>
@@ -24367,34 +24362,34 @@ def my_form_open(dialog, layer, feature):
                         <prop v="1" k="vertical_anchor_point"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="0,72,255,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="0,72,255,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="0,72,255,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="0,72,255,255" k="color"/>
@@ -24409,77 +24404,77 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-                <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -24489,62 +24484,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -24575,9 +24570,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24585,157 +24580,157 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="quadrant" configurationFlags="None">
+        <field configurationFlags="None" name="quadrant">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -24744,95 +24739,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Name" index="0"/>
-        <alias name="" field="descriptio" index="1"/>
-        <alias name="" field="timestamp" index="2"/>
-        <alias name="" field="begin" index="3"/>
-        <alias name="" field="end" index="4"/>
-        <alias name="" field="Distance" index="5"/>
-        <alias name="" field="RouteLen" index="6"/>
-        <alias name="" field="Source" index="7"/>
-        <alias name="" field="Sort" index="8"/>
-        <alias name="" field="day" index="9"/>
-        <alias name="" field="length_km" index="10"/>
-        <alias name="" field="length_m" index="11"/>
-        <alias name="" field="org_fid" index="12"/>
-        <alias name="" field="distance" index="13"/>
-        <alias name="" field="quadrant" index="14"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="Sort" index="8" name=""/>
+        <alias field="day" index="9" name=""/>
+        <alias field="length_km" index="10" name=""/>
+        <alias field="length_m" index="11" name=""/>
+        <alias field="org_fid" index="12" name=""/>
+        <alias field="distance" index="13" name=""/>
+        <alias field="quadrant" index="14" name=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="Sort" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="quadrant" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="distance" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="quadrant" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Sort" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="org_fid" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="quadrant" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="Name" desc=""/>
-        <constraint exp="" field="descriptio" desc=""/>
-        <constraint exp="" field="timestamp" desc=""/>
-        <constraint exp="" field="begin" desc=""/>
-        <constraint exp="" field="end" desc=""/>
-        <constraint exp="" field="Distance" desc=""/>
-        <constraint exp="" field="RouteLen" desc=""/>
-        <constraint exp="" field="Source" desc=""/>
-        <constraint exp="" field="Sort" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="length_km" desc=""/>
-        <constraint exp="" field="length_m" desc=""/>
-        <constraint exp="" field="org_fid" desc=""/>
-        <constraint exp="" field="distance" desc=""/>
-        <constraint exp="" field="quadrant" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="org_fid" hidden="0" width="-1"/>
-          <column type="field" name="distance" hidden="0" width="-1"/>
-          <column type="field" name="Name" hidden="0" width="-1"/>
-          <column type="field" name="Source" hidden="0" width="-1"/>
-          <column type="field" name="RouteLen" hidden="0" width="-1"/>
-          <column type="field" name="descriptio" hidden="0" width="-1"/>
-          <column type="field" name="timestamp" hidden="0" width="-1"/>
-          <column type="field" name="begin" hidden="0" width="-1"/>
-          <column type="field" name="end" hidden="0" width="-1"/>
-          <column type="field" name="Distance" hidden="0" width="-1"/>
-          <column type="field" name="length_km" hidden="0" width="-1"/>
-          <column type="field" name="Sort" hidden="0" width="-1"/>
-          <column type="field" name="quadrant" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="length_m" hidden="0" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="org_fid" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="-1"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column hidden="0" name="Sort" type="field" width="-1"/>
+          <column hidden="0" name="quadrant" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24864,21 +24859,21 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="quadrant"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -24898,28 +24893,28 @@ def my_form_open(dialog, layer, feature):
         <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 maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24992,58 +24987,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="229,182,54,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25074,36 +25069,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -25118,44 +25113,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25178,38 +25173,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -25224,9 +25219,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25237,39 +25232,39 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -25278,35 +25273,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="area" index="1"/>
-        <alias name="" field="rotation" index="2"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="area" index="1" name=""/>
+        <alias field="rotation" index="2" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="area"/>
-        <default expression="" applyOnUpdate="0" field="rotation"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="area" expression="" applyOnUpdate="0"/>
+        <default field="rotation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="area" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="rotation" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="area" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="rotation" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="area" desc=""/>
-        <constraint exp="" field="rotation" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="area" desc="" exp=""/>
+        <constraint field="rotation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="area" hidden="0" width="-1"/>
-          <column type="field" name="rotation" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="area" type="field" width="-1"/>
+          <column hidden="0" name="rotation" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25329,7 +25324,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -25394,7 +25389,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -25419,58 +25414,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="196,60,57,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25501,36 +25496,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -25545,44 +25540,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25605,49 +25600,49 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule checkstate="0" label="All distances" symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="1" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="0.5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25670,20 +25665,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25695,64 +25690,64 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="StringList" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="StringList">
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -25783,9 +25778,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25793,116 +25788,116 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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/>
@@ -25911,85 +25906,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Name" index="0"/>
-        <alias name="" field="descriptio" index="1"/>
-        <alias name="" field="timestamp" index="2"/>
-        <alias name="" field="begin" index="3"/>
-        <alias name="" field="end" index="4"/>
-        <alias name="" field="RouteLen" index="5"/>
-        <alias name="" field="Source" index="6"/>
-        <alias name="" field="length_m" index="7"/>
-        <alias name="" field="length_km" index="8"/>
-        <alias name="" field="org_fid" index="9"/>
-        <alias name="" field="distance" index="10"/>
-        <alias name="" field="first_runn" index="11"/>
-        <alias name="" field="last_runne" index="12"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="first_runn" expression="" applyOnUpdate="0"/>
+        <default field="last_runne" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="distance" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="first_runn" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="last_runne" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="org_fid" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="first_runn" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="last_runne" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="Name" desc=""/>
-        <constraint exp="" field="descriptio" desc=""/>
-        <constraint exp="" field="timestamp" desc=""/>
-        <constraint exp="" field="begin" desc=""/>
-        <constraint exp="" field="end" desc=""/>
-        <constraint exp="" field="RouteLen" desc=""/>
-        <constraint exp="" field="Source" desc=""/>
-        <constraint exp="" field="length_m" desc=""/>
-        <constraint exp="" field="length_km" desc=""/>
-        <constraint exp="" field="org_fid" desc=""/>
-        <constraint exp="" field="distance" desc=""/>
-        <constraint exp="" field="first_runn" desc=""/>
-        <constraint exp="" field="last_runne" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="begin" hidden="0" width="179"/>
-          <column type="field" name="RouteLen" hidden="0" width="-1"/>
-          <column type="field" name="Source" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="Name" hidden="0" width="-1"/>
-          <column type="field" name="length_m" hidden="0" width="-1"/>
-          <column type="field" name="length_km" hidden="0" width="-1"/>
-          <column type="field" name="org_fid" hidden="0" width="-1"/>
-          <column type="field" name="first_runn" hidden="0" width="-1"/>
-          <column type="field" name="last_runne" hidden="0" width="-1"/>
-          <column type="field" name="descriptio" hidden="0" width="-1"/>
-          <column type="field" name="timestamp" hidden="0" width="-1"/>
-          <column type="field" name="end" hidden="0" width="-1"/>
-          <column type="field" name="distance" hidden="0" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="179"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column hidden="0" name="org_fid" type="field" width="-1"/>
+          <column hidden="0" name="first_runn" type="field" width="-1"/>
+          <column hidden="0" name="last_runne" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26021,31 +26016,31 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="display" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="distance_1" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="first_run" editable="1"/>
-        <field name="first_runn" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="first_runner_s" editable="1"/>
-        <field name="last_run" editable="0"/>
-        <field name="last_runn" editable="1"/>
-        <field name="last_runne" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="last_runner_s" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="display"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="distance_1"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="first_run"/>
+        <field editable="1" name="first_runn"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="first_runner_s"/>
+        <field editable="0" name="last_run"/>
+        <field editable="1" name="last_runn"/>
+        <field editable="1" name="last_runne"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="last_runner_s"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -26080,7 +26075,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -26153,58 +26148,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,178,151,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26235,36 +26230,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -26279,44 +26274,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26339,58 +26334,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" filter="&quot;type&quot; IS 'car'" symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule label="Walking" filter="&quot;type&quot; IS 'walk'" symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car" filter="&quot;type&quot; IS 'car'"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="123,211,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26421,50 +26416,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="4;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1.25"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -26495,30 +26490,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -26538,33 +26533,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -26580,32 +26575,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -26620,9 +26615,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -26635,60 +26630,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -26719,9 +26714,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26729,30 +26724,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -26761,30 +26756,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26816,8 +26811,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -26829,7 +26824,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26902,58 +26897,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,82,45,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26984,36 +26979,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -27028,44 +27023,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -27088,44 +27083,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="15" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="label" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="15" capitalization="0" fieldName="label" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -27140,115 +27135,115 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="0" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -27279,9 +27274,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27289,30 +27284,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -27321,30 +27316,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="label" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="label" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="label"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="label" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="label" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="label" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27376,8 +27371,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -27389,7 +27384,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -27454,7 +27449,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -27479,58 +27474,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="125,139,143,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -27561,36 +27556,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -27605,44 +27600,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -27665,54 +27660,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="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 key="{c438992b-4486-4e7d-a594-2c46fe177154}" 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">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="75" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Bold" fontLetterSpacing="0" forcedBold="0" fontSize="8" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="31,120,180,255" legendString="Aa" fontItalic="0" fieldName="label" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Bold" fontKerning="1" forcedItalic="0" textColor="31,120,180,255" fontSize="8" capitalization="0" fieldName="label" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="75" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="0.40000000000000002" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="0.75"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0.75" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="31,120,206,255" shapeRadiiX="0.5" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.29999999999999999" shapeRadiiY="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeBlendMode="0" shapeFillColor="255,255,255,204" shapeOpacity="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="0.75" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.75" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,204" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeBlendMode="0" shapeSizeY="0.29999999999999999" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0.5" shapeOpacity="0.59999999999999998" shapeRotation="0" shapeOffsetY="-0.14999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="196,60,57,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -27735,34 +27730,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,204"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="31,120,206,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.75"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,204"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="31,120,206,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.75"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,204" k="color"/>
@@ -27777,56 +27772,56 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="0" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="1" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PolygonGeometry" lineAnchorClipping="0" centroidWhole="1" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="1" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="0.76000000000000001" zIndex="5" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="6" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="1"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="1" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="1" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PolygonGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="6" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="5" fontLimitPixelSize="0" obstacleFactor="0.76000000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -27835,66 +27830,66 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -27925,9 +27920,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27935,66 +27930,66 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option type="double" name="allowedGapsBuffer" value="0"/>
-            <Option type="bool" name="allowedGapsEnabled" value="false"/>
-            <Option type="QString" name="allowedGapsLayer" value=""/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_set" configurationFlags="None">
+        <field configurationFlags="None" name="table_set">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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/>
@@ -28003,45 +27998,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="table_set" index="1"/>
-        <alias name="" field="label" index="2"/>
-        <alias name="" field="races" index="3"/>
-        <alias name="" field="day" index="4"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="table_set" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="table_set" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="races" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="table_set" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="races" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="table_set" desc=""/>
-        <constraint exp="" field="label" desc=""/>
-        <constraint exp="" field="races" desc=""/>
-        <constraint exp="" field="day" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="table_set" hidden="0" width="-1"/>
-          <column type="field" name="label" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="races" hidden="0" width="130"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="table_set" type="field" width="-1"/>
+          <column hidden="0" name="label" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="races" type="field" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28073,11 +28068,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="day" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="day"/>
@@ -28087,11 +28082,11 @@ def my_form_open(dialog, layer, feature):
         <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/>
@@ -28294,7 +28289,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/Fencing</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal maps</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -28456,361 +28451,361 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option name="name" type="QString" value=""/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option name="type" type="QString" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer style="default" expanded="1" visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="0" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <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="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Cones" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Cones">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="Fencing" expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Fencing and Cones"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Fencing">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="Fencing" expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-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-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Fencing and Cones"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - inset">
+      <layer style="default" expanded="1" visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <layer style="Fencing" expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - main">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <layer style="Fencing" expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal plan" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal plan">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <layer style="Fencing" expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Routes">
+      <layer style="default" expanded="1" visible="0" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <layer style="Fencing" expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-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-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="0"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <layer style="Fencing" expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <expanded-group-nodes>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
@@ -28839,31 +28834,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -28878,49 +28873,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -28935,9 +28930,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28945,15 +28940,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="5" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="19.9422,32,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="128.508,3.98741,mm" background="true" frame="true" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="bevel" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.1,mm" wrapChar="" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-        <FrameColor green="128" blue="128" red="128" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="128.508,3.98741,mm" frame="true" resizeToContents="1" size="19.9422,32,mm" fontColor="#000000" zValue="5" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="bevel" lineSpacing="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" outlineWidthM="0.1,mm" wmsLegendWidth="50" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="128.508,3.98741,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="128" alpha="255" green="128" blue="128"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28961,37 +28956,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="1" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28999,62 +28994,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" blendMode="0" drawCanvasItems="false" followPresetName="Marshal map - inset" outlineWidthM="0.2,mm" keepLayerSet="false" position="98.7828,149.027,mm" positionLock="true" type="65639" size="56.5192,54.5647,mm" positionOnPage="98.7828,149.027,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="4" frame="true" mapRotation="0" itemRotation="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" isTemporal="0" excludeFromExports="0" id="Inset map" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="4" size="56.5192,54.5647,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" itemRotation="0" id="Inset map" position="98.7828,149.027,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPresetName="Marshal map - inset" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="98.7828,149.027,mm" outlineWidthM="0.2,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94188878914365404" xmin="18.41788569471234993" xmax="18.42218047871277165" ymin="-33.94603505205213878"/>
+        <Extent ymin="-33.91647297528887606" xmax="18.42437871848258268" ymax="-33.91232887817815111" xmin="18.42008617785988278"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -29085,44 +29080,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -29145,40 +29140,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -29193,29 +29188,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29223,28 +29218,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" position="3" show="1" blendMode="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0">
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <ComposerMapOverview inverted="0" position="3" centered="1" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,65,170,127"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,102"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,65,170,127"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,102"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,65,170,127" k="color"/>
@@ -29259,9 +29254,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29269,9 +29264,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29279,69 +29274,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="false" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" drawCanvasItems="false" followPresetName="Marshal map - main" outlineWidthM="0.3,mm" keepLayerSet="false" position="3.53,6.0007,mm" positionLock="true" type="65639" size="142,187.018,mm" positionOnPage="3.53,6.0007,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="3" frame="false" mapRotation="0" itemRotation="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" isTemporal="0" excludeFromExports="0" id="Main map" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="false" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="3" size="142,187.018,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0" id="Main map" position="3.53,6.0007,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPresetName="Marshal map - main" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94328520011277561" xmin="18.41951926258746752" xmax="18.42054691083765405" ymin="-33.94463864108302431"/>
+        <Extent ymin="-33.91507729373412161" xmax="18.4227460039006381" ymax="-33.91372455973290556" xmin="18.42171889244182736"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -29372,44 +29367,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -29432,40 +29427,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -29480,29 +29475,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29510,22 +29505,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="false" sectionY="0" sectionHeight="187.018" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" blendMode="0" outlineWidthM="0.3,mm" position="290.617,6.0007,mm" positionLock="true" type="65647" size="142.117,187.018,mm" positionOnPage="290.617,6.0007,mm" hidePageIfEmpty="0" visibility="1" groupUuid="" sectionX="0" frameJoinStyle="round" referencePoint="2" zValue="2" frame="false" itemRotation="0" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" hideBackgroundIfEmpty="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="119" blue="119" red="119" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="2" visibility="1" hideBackgroundIfEmpty="0" background="false" excludeFromExports="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" groupUuid="" zValue="2" sectionHeight="187.018" size="142.117,187.018,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hidePageIfEmpty="0" itemRotation="0" id="" position="290.617,6.0007,mm" sectionY="0" frameJoinStyle="round" opacity="1" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionLock="true" positionOnPage="290.617,6.0007,mm" outlineWidthM="0.3,mm" sectionX="0" frame="false" type="65647" blendMode="0">
+        <FrameColor red="119" alpha="255" green="119" blue="119"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29533,21 +29528,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="25.2491" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="246.665,178.41,mm" resizeMode="0" positionLock="true" type="65640" size="47.1065,27.6,mm" positionOnPage="246.665,178.41,mm" svgFillColor="255,255,255,255" anchorPoint="0" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="1" frame="false" mode="1" itemRotation="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureWidth="47.1065" mapUuid="" excludeFromExports="0" file="../GunRun2022_500.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_500.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="1" size="47.1065,27.6,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" itemRotation="0" id="" position="246.665,178.41,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" pictureHeight="25.2491" positionOnPage="246.665,178.41,mm" outlineWidthM="0.3,mm" pictureWidth="47.1065" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="0" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29555,14 +29550,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame url="" type="65648" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&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>" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" contentMode="1" evaluateExpressions="true" useSmartBreaks="true" stylesheetEnabled="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame stylesheetEnabled="true" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" resizeMode="0" 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;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races &lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&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  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" contentMode="1" evaluateExpressions="true" maxBreakDistance="12" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" url="" 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 type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29572,53 +29567,60 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="jpg"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropMarginUnit" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="false"/>
-          <Option type="QString" name="resizeToContentsBottomMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsLeftMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsRightMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsTopMargin" value="3.53"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropMarginUnit" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~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"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="false"/>
+          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="&quot;id&quot;" pageNameExpression="&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" sortAscending="1" sortFeatures="1" coverageLayerName="marshal_positions" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" enabled="1" hideCoverage="0" coverageLayerName="marshal_positions" sortKey="&quot;id&quot;" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortAscending="1" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -29633,49 +29635,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29690,9 +29692,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29700,21 +29702,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem background="false" pictureRotation="330" pictureHeight="7.97477" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="286.027,2,mm" resizeMode="0" positionLock="true" type="65640" size="9.45865,11,mm" positionOnPage="286.027,2,mm" svgFillColor="255,255,255,255" anchorPoint="0" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="0" itemRotation="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureWidth="6.31767" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" file="arrows/NorthArrow_11.svg" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="arrows/NorthArrow_11.svg" mode="0" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="9.45865,11,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" itemRotation="0" id="" position="286.027,2,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" pictureHeight="7.97477" positionOnPage="286.027,2,mm" outlineWidthM="0.3,mm" pictureWidth="6.31767" pictureRotation="330" frame="false" type="65640" blendMode="0" anchorPoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29722,47 +29724,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" blendMode="0" outlineWidthM="0.3,mm" position="285.027,205.886,mm" positionLock="true" type="65641" size="142.543,10.3185,mm" positionOnPage="285.027,205.886,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" labelText="[%upper( &quot;area&quot; )%]" itemRotation="270" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" marginX="1" size="142.543,10.3185,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginY="1" itemRotation="270" id="" position="285.027,205.886,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" halign="1" positionLock="true" htmlState="0" positionOnPage="285.027,205.886,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="[%upper( &quot;area&quot; )%]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29777,65 +29779,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem unitType="meters" type="65646" groupUuid="" labelHorizontalPlacement="0" numSegments="4" labelVerticalPlacement="0" zValue="2" numUnitsPerSegment="100" lineCapStyle="square" itemRotation="0" labelBarSpace="3" size="145.54,16.2165,mm" referencePoint="0" numSegmentsLeft="2" segmentMillimeters="26.3519" positionLock="true" style="Single Box" blendMode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitLabel="m" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm" numSubdivisions="1" background="false" minBarWidth="50" frame="false" lineJoinStyle="miter" visibility="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" maxBarWidth="150" subdivisionsHeight="1.5" alignment="0" segmentSizeMode="1" id="" frameJoinStyle="miter" outlineWidth="0.3" height="3" boxContentSpace="1" outlineWidthM="0.3,mm" positionOnPage="7,189.669,mm" excludeFromExports="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem unitType="meters" subdivisionsHeight="1.5" positionOnPage="7,189.669,mm" frame="false" size="145.54,16.2165,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" labelVerticalPlacement="0" numSegmentsLeft="2" zValue="2" itemRotation="0" positionLock="true" numMapUnitsPerScaleBarUnit="1" labelHorizontalPlacement="0" frameJoinStyle="miter" labelBarSpace="3" visibility="1" maxBarWidth="150" outlineWidthM="0.3,mm" height="3" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" boxContentSpace="1" referencePoint="0" opacity="1" groupUuid="" numSegments="4" numSubdivisions="1" outlineWidth="0.3" excludeFromExports="0" position="7,189.669,mm" lineCapStyle="square" unitLabel="m" id="" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" blendMode="0" lineJoinStyle="miter" segmentSizeMode="1" alignment="0" numUnitsPerSegment="100" background="false" minBarWidth="50" type="65646" style="Single Box" segmentMillimeters="26.3519">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29850,75 +29852,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" red="0" alpha="255"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <Option name="decimal_separator" type="QChar" value=""/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="QChar" value=""/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" red="0" alpha="255"/>
-        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29949,52 +29951,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30025,52 +30027,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30101,36 +30103,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -30145,36 +30147,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -30189,87 +30191,87 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem background="false" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" blendMode="0" drawCanvasItems="false" followPresetName="Start/Finish" outlineWidthM="0.3,mm" keepLayerSet="false" position="7,5.5,mm" positionLock="true" type="65639" size="278.027,180.318,mm" positionOnPage="7,5.5,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="330" itemRotation="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="330" background="false" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="278.027,180.318,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0" id="" position="7,5.5,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPresetName="Start/Finish" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="7,5.5,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="rotation"/>
-                  <Option type="int" name="type" value="2"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="rotation"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="id"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="id"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
+        <Extent ymin="-33.90494830469008747" xmax="18.41790915398017958" ymax="-33.89880140828828559" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" leftAnnotationDisplay="3" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="1" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="5" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="4" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridStyle="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="5" topAnnotationDisplay="3" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="4" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="5" topAnnotationDisplay="3" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationDirection="0" blendMode="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedTicksEnabled="0" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="3" intervalY="5" leftFrameDivisions="0" unit="1" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -30300,44 +30302,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -30360,9 +30362,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30379,32 +30381,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -30419,29 +30421,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30449,65 +30451,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
-          <Option type="QString" name="svgCropMarginBottom" value="0"/>
-          <Option type="QString" name="svgCropMarginLeft" value="0"/>
-          <Option type="QString" name="svgCropMarginRight" value="0"/>
-          <Option type="QString" name="svgCropMarginTop" value="0"/>
-          <Option type="QString" name="svgCropToContents" value="true"/>
-          <Option type="QString" name="svgDisableRasterTiles" value="0"/>
-          <Option type="QString" name="svgGroupLayers" value="false"/>
-          <Option type="QString" name="svgIncludeMetadata" value="1"/>
-          <Option type="QString" name="svgTextFormat" value="0"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
+          <Option name="svgCropMarginBottom" type="QString" value="0"/>
+          <Option name="svgCropMarginLeft" type="QString" value="0"/>
+          <Option name="svgCropMarginRight" type="QString" value="0"/>
+          <Option name="svgCropMarginTop" type="QString" value="0"/>
+          <Option name="svgCropToContents" type="QString" value="true"/>
+          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
+          <Option name="svgGroupLayers" type="QString" value="false"/>
+          <Option name="svgIncludeMetadata" type="QString" value="1"/>
+          <Option name="svgTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="start_finish_area" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" enabled="1" hideCoverage="1" coverageLayerName="start_finish_area" sortKey="area" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;"/>
     </Layout>
-    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -30522,49 +30524,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -30579,9 +30581,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30589,15 +30591,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="11" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="38.1563,67.2879,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="256.808,5.21277,mm" background="true" frame="true" resizeToContents="0" visibility="1" legendFilterByAtlas="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="256.808,5.21277,mm" frame="true" resizeToContents="0" size="38.1563,67.2879,mm" fontColor="#000000" zValue="11" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="256.808,5.21277,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30605,53 +30607,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="Bold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="Bold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="fencing" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option type="QString" name="legend/expressionFilter" value=""/>
-                  <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30659,47 +30661,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" positionLock="true" type="65641" size="148.46,6.45211,mm" positionOnPage="6.76779,191.188,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="10" frame="false" labelText="FENCING: [% &quot;name&quot; %]" itemRotation="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="10" marginX="0" size="148.46,6.45211,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginY="0" itemRotation="0" id="" position="6.76779,191.188,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" halign="1" positionLock="true" htmlState="0" positionOnPage="6.76779,191.188,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30714,65 +30716,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" blendMode="0" outlineWidthM="0.3,mm" position="182.723,191.188,mm" positionLock="true" type="65641" size="56.3557,6.45237,mm" positionOnPage="182.723,191.188,mm" marginY="0" visibility="1" htmlState="1" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="9" frame="false" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" itemRotation="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="9" marginX="0" size="56.3557,6.45237,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginY="0" itemRotation="0" id="" position="182.723,191.188,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" halign="2" positionLock="true" htmlState="1" positionOnPage="182.723,191.188,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30787,65 +30789,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" blendMode="0" outlineWidthM="0.3,mm" position="209.146,198.083,mm" positionLock="true" type="65641" size="26.8205,6.82826,mm" positionOnPage="209.146,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="REVISION 2.1" itemRotation="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="26.8205,6.82826,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginY="0" itemRotation="0" id="" position="209.146,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" halign="2" positionLock="true" htmlState="0" positionOnPage="209.146,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 2.1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30860,65 +30862,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" blendMode="0" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" positionLock="true" type="65641" size="51.1638,7.07327,mm" positionOnPage="62.6706,198.083,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="7" frame="false" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="7" marginX="1" size="51.1638,7.07327,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginY="1" itemRotation="0" id="" position="62.6706,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" halign="1" positionLock="true" htmlState="0" positionOnPage="62.6706,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30933,65 +30935,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" blendMode="0" outlineWidthM="0.3,mm" position="116.805,198.083,mm" positionLock="true" type="65641" size="64.7594,7.10512,mm" positionOnPage="116.805,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="0" size="64.7594,7.10512,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginY="0" itemRotation="0" id="" position="116.805,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" halign="1" positionLock="true" htmlState="0" positionOnPage="116.805,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31006,65 +31008,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" positionLock="true" type="65641" size="52.7903,7.07327,mm" positionOnPage="6.76779,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="0" size="52.7903,7.07327,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginY="0" itemRotation="0" id="" position="6.76779,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" halign="1" positionLock="true" htmlState="0" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Page [% @atlas_featurenumber %]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31079,39 +31081,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="26.4325" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="243.098,175.353,mm" resizeMode="0" positionLock="true" type="65640" size="49.3143,29.8354,mm" positionOnPage="243.098,175.353,mm" svgFillColor="255,255,255,255" anchorPoint="8" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="1" itemRotation="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureWidth="49.3143" mapUuid="" excludeFromExports="0" file="../GunRun2022_250.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_250.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="49.3143,29.8354,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" itemRotation="0" id="" position="243.098,175.353,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" pictureHeight="26.4325" positionOnPage="243.098,175.353,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="8" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31119,42 +31121,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" positionLock="true" type="65643" size="232.01,0.14328,mm" positionOnPage="6.91779,197.79,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" itemRotation="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" itemRotation="0" id="" position="6.91779,197.79,mm" frameJoinStyle="miter" opacity="1" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" shapeType="1" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -31169,55 +31171,55 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem unitType="meters" type="65646" groupUuid="" labelHorizontalPlacement="0" numSegments="2" labelVerticalPlacement="0" zValue="2" numUnitsPerSegment="10" lineCapStyle="square" itemRotation="0" labelBarSpace="1" size="98.3387,15.8378,mm" referencePoint="0" numSegmentsLeft="2" segmentMillimeters="29.5258" positionLock="true" style="Double Box" blendMode="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" numSubdivisions="1" background="false" minBarWidth="25" frame="false" lineJoinStyle="round" visibility="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" maxBarWidth="100" subdivisionsHeight="1.5" alignment="0" segmentSizeMode="1" id="" frameJoinStyle="miter" outlineWidth="0.2" height="2" boxContentSpace="0.2" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem unitType="meters" subdivisionsHeight="1.5" positionOnPage="6.76779,2.8482,mm" frame="false" size="98.3387,15.8378,mm" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" labelVerticalPlacement="0" numSegmentsLeft="2" zValue="2" itemRotation="0" positionLock="true" numMapUnitsPerScaleBarUnit="1" labelHorizontalPlacement="0" frameJoinStyle="miter" labelBarSpace="1" visibility="1" maxBarWidth="100" outlineWidthM="0.3,mm" height="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" boxContentSpace="0.2" referencePoint="0" opacity="1" groupUuid="" numSegments="2" numSubdivisions="1" outlineWidth="0.2" excludeFromExports="0" position="6.76779,2.8482,mm" lineCapStyle="square" unitLabel="m" id="" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" lineJoinStyle="round" segmentSizeMode="1" alignment="0" numUnitsPerSegment="10" background="false" minBarWidth="25" type="65646" style="Double Box" segmentMillimeters="29.5258">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31232,75 +31234,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" red="0" alpha="255"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <Option name="decimal_separator" type="QChar" value=""/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="QChar" value=""/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" red="0" alpha="255"/>
-        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -31331,52 +31333,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -31407,52 +31409,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -31483,36 +31485,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -31527,36 +31529,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31571,53 +31573,53 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem background="false" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" blendMode="0" drawCanvasItems="false" followPresetName="Fencing" outlineWidthM="0.3,mm" keepLayerSet="false" position="6.76779,9.35102,mm" positionLock="true" type="65639" size="283.418,180.92,mm" positionOnPage="6.76779,9.35102,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" isTemporal="0" excludeFromExports="0" id="" opacity="0.9">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="false" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="283.418,180.92,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" id="" position="6.76779,9.35102,mm" isTemporal="0" frameJoinStyle="miter" opacity="0.9" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPresetName="Fencing" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" name="exponent" value="1"/>
-                      <Option type="double" name="maxOutput" value="360"/>
-                      <Option type="double" name="maxValue" value="0"/>
-                      <Option type="double" name="minOutput" value="0"/>
-                      <Option type="double" name="minValue" value="0"/>
-                      <Option type="double" name="nullOutput" value="0"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option type="int" name="t" value="0"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option type="int" name="type" value="3"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91773520642930606" xmin="18.38521625771440782" xmax="18.38607854950289422" ymin="-33.91828564989084072"/>
+        <Extent ymin="-33.91828564989084072" xmax="18.38607854950289422" ymax="-33.91773520642930606" xmin="18.38521625771440782"/>
         <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>
@@ -31632,45 +31634,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" leftAnnotationDisplay="3" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="1" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="5" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="4" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridStyle="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="5" topAnnotationDisplay="3" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="4" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="5" topAnnotationDisplay="3" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationDirection="0" blendMode="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedTicksEnabled="0" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="3" intervalY="5" leftFrameDivisions="0" unit="1" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -31701,44 +31703,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -31761,9 +31763,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31780,32 +31782,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -31820,29 +31822,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31850,65 +31852,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="true"/>
-          <Option type="bool" name="singleFile" value="true"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas 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" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="fence_and_cone_groups" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="virtual" filterFeatures="0" 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" enabled="1" hideCoverage="1" coverageLayerName="fence_and_cone_groups" sortKey="&quot;group&quot;" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;"/>
     </Layout>
-    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="9" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="9"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -31923,49 +31925,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31980,9 +31982,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31992,47 +31994,47 @@ def my_form_open(dialog, layer, feature):
           <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" valign="64" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" blendMode="0" outlineWidthM="0.3,mm" position="4.43449,186.634,mm" positionLock="false" type="65641" size="83.9998,10.4638,mm" positionOnPage="4.43449,186.634,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="Directions to Start of Race" itemRotation="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="1" size="83.9998,10.4638,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginY="1" itemRotation="0" id="" position="4.43449,186.634,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" halign="1" positionLock="false" htmlState="0" positionOnPage="4.43449,186.634,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Directions to Start of Race">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="14" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="14" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32047,65 +32049,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" blendMode="0" outlineWidthM="0.3,mm" position="4.43449,197.498,mm" positionLock="false" type="65641" size="48.2923,9.511,mm" positionOnPage="4.43449,197.498,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="7" frame="false" labelText="Gun Run" itemRotation="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="7" marginX="1" size="48.2923,9.511,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginY="1" itemRotation="0" id="" position="4.43449,197.498,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" halign="1" positionLock="false" htmlState="0" positionOnPage="4.43449,197.498,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Gun Run">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32120,33 +32122,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem splitLayer="0" lineSpacing="2" type="65642" groupUuid="" equalColumnWidth="0" zValue="6" maxSymbolSize="0" itemRotation="0" symbolWidth="9" size="59.0766,76,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="false" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorderColor="0,0,0,255" title="" symbolHeight="5" position="10.096,10.8563,mm" background="true" frame="true" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" legendFilterByMap="1" frameJoinStyle="round" columnSpace="0" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-        <FrameColor green="139" blue="139" red="139" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="10.096,10.8563,mm" frame="true" resizeToContents="1" size="59.0766,76,mm" fontColor="#000000" zValue="6" wrapChar="" splitLayer="0" itemRotation="0" positionLock="false" frameJoinStyle="round" lineSpacing="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" minSymbolSize="0" symbolHeight="5" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" legendFilterByMap="1" excludeFromExports="0" position="10.096,10.8563,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="9" id="" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="0" maxSymbolSize="0" columnSpace="0" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="139" alpha="255" green="139" blue="139"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32154,52 +32156,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="3" alignment="1" marginTop="2.5">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" marginLeft="3" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Ask Me" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option type="QString" name="legend/title-style" value="hidden"/>
+                <Option name="legend/title-style" type="QString" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="poi_labels" expanded="1" source="./poi_labels.shp|layername=poi_labels" legend_exp="" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/label-0" value="Start/Finish"/>
-                  <Option type="QString" name="legend/label-1" value="Toilets"/>
-                  <Option type="QString" name="legend/label-2" value="Tog Bag Drop-off"/>
-                  <Option type="QString" name="legend/label-3" value="Road Closed to Cars"/>
-                  <Option type="QString" name="legend/label-4" value="MyCiti Drop-off"/>
-                  <Option type="QString" name="legend/label-5" value="Parking"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
+                  <Option name="legend/label-1" type="QString" value="Toilets"/>
+                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
+                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
+                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
+                  <Option name="legend/label-5" type="QString" value="Parking"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="directions_to_start" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/label-0" value="To 21KM Start (06:30)"/>
-                  <Option type="QString" name="legend/label-1" value="To 10KM Start (07:30)"/>
-                  <Option type="QString" name="legend/label-2" value="To 5KM Start (08:30)"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
+                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
+                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32207,47 +32209,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" blendMode="0" outlineWidthM="0.3,mm" position="221.862,190.027,mm" positionLock="false" type="65641" size="27.7839,6.871,mm" positionOnPage="221.862,190.027,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="REVISION 1.0" itemRotation="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="1" size="27.7839,6.871,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginY="1" itemRotation="0" id="" position="221.862,190.027,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" halign="2" positionLock="false" htmlState="0" positionOnPage="221.862,190.027,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 1.0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32262,65 +32264,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" blendMode="0" outlineWidthM="0.3,mm" position="197.975,197.498,mm" positionLock="false" type="65641" size="51.6706,6.60801,mm" positionOnPage="197.975,197.498,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" labelText="Sunday, 20 October 2019" itemRotation="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="4" marginX="1" size="51.6706,6.60801,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginY="1" itemRotation="0" id="" position="197.975,197.498,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" halign="2" positionLock="false" htmlState="0" positionOnPage="197.975,197.498,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Sunday, 20 October 2019">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32335,39 +32337,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="24.3824" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="249.646,179.724,mm" resizeMode="0" positionLock="false" type="65640" size="42.9838,24.3824,mm" positionOnPage="249.646,179.724,mm" svgFillColor="255,255,255,255" anchorPoint="4" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" mode="1" itemRotation="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureWidth="24.2337" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" file="../Gun_Run_Logo.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../Gun_Run_Logo.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="3" size="42.9838,24.3824,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" itemRotation="0" id="" position="249.646,179.724,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" pictureHeight="24.3824" positionOnPage="249.646,179.724,mm" outlineWidthM="0.3,mm" pictureWidth="24.2337" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="4" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32375,42 +32377,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0" outlineWidthM="0.3,mm" position="4.58449,197.248,mm" positionLock="false" type="65643" size="244.912,0.1,mm" positionOnPage="4.58449,197.248,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="2" frame="false" itemRotation="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="2" cornerRadiusMeasure="0,mm" size="244.912,0.1,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" itemRotation="0" id="" position="4.58449,197.248,mm" frameJoinStyle="miter" opacity="1" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" shapeType="1" positionOnPage="4.58449,197.248,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -32425,46 +32427,46 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" blendMode="0" drawCanvasItems="false" followPresetName="Ask Me" outlineWidthM="0.3,mm" keepLayerSet="false" position="4.43449,6.411,mm" positionLock="false" type="65639" size="288.007,183.616,mm" positionOnPage="4.43449,6.411,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="288.007,183.616,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0" id="" position="4.43449,6.411,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPresetName="Ask Me" followPreset="true" positionLock="false" labelMargin="0,mm" positionOnPage="4.43449,6.411,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" xmax="18.41789384089274151" ymin="-33.90994364588821952"/>
+        <Extent ymin="-33.90994364588821952" xmax="18.41789384089274151" ymax="-33.8970204297764468" 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>
@@ -32479,45 +32481,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -32548,44 +32550,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -32608,40 +32610,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -32656,29 +32658,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32686,56 +32688,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" coverageLayer="" hideCoverage="0" sortFeatures="0" filterFeatures="0" enabled="0"/>
+      <Atlas filterFeatures="0" enabled="0" hideCoverage="0" sortFeatures="0" coverageLayer="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression=""/>
     </Layout>
-    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -32750,49 +32752,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -32807,9 +32809,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32819,47 +32821,47 @@ def my_form_open(dialog, layer, feature):
           <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" valign="32" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" blendMode="0" outlineWidthM="0.3,mm" position="200.171,199.082,mm" positionLock="true" type="65641" size="61.5373,6.8714,mm" positionOnPage="200.171,199.082,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="13" frame="false" labelText="REVISION 3.2" itemRotation="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="13" marginX="0" size="61.5373,6.8714,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginY="0" itemRotation="0" id="" position="200.171,199.082,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" halign="2" positionLock="true" htmlState="0" positionOnPage="200.171,199.082,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 3.2">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32874,65 +32876,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" blendMode="0" outlineWidthM="0.3,mm" position="9.7863,192.073,mm" positionLock="true" type="65641" size="61.5373,6.60801,mm" positionOnPage="9.7863,192.073,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="12" frame="false" labelText="Gun Run 2022: [%&quot;Source&quot;%]" itemRotation="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="12" marginX="0" size="61.5373,6.60801,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginY="0" itemRotation="0" id="" position="9.7863,192.073,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" halign="1" positionLock="true" htmlState="0" positionOnPage="9.7863,192.073,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32947,65 +32949,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" blendMode="0" outlineWidthM="0.3,mm" position="9.7863,199.082,mm" positionLock="true" type="65641" size="61.5373,6.60801,mm" positionOnPage="9.7863,199.082,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="11" frame="false" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" itemRotation="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="11" marginX="0" size="61.5373,6.60801,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginY="0" itemRotation="0" id="" position="9.7863,199.082,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" halign="1" positionLock="true" htmlState="0" positionOnPage="9.7863,199.082,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33020,39 +33022,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="15.9472" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="262.196,188.218,mm" resizeMode="0" positionLock="true" type="65640" size="29.7523,17.4718,mm" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255" anchorPoint="4" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="10" frame="false" mode="1" itemRotation="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureWidth="29.7523" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" file="../GunRun2022_250.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_250.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="10" size="29.7523,17.4718,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" itemRotation="0" id="" position="262.196,188.218,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" pictureHeight="15.9472" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="4" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33060,42 +33062,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0" outlineWidthM="0.3,mm" position="9.57644,198.832,mm" positionLock="true" type="65643" size="251.982,0.1,mm" positionOnPage="9.57644,198.832,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="9" frame="false" itemRotation="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="9" cornerRadiusMeasure="0,mm" size="251.982,0.1,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" itemRotation="0" id="" position="9.57644,198.832,mm" frameJoinStyle="miter" opacity="1" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" shapeType="1" positionOnPage="9.57644,198.832,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33110,321 +33112,321 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="9.57644,5.42566,mm" positionLock="true" type="65639" size="107.861,186.385,mm" positionOnPage="9.57644,5.42566,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="8" frame="true" mapRotation="0" itemRotation="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" isTemporal="0" excludeFromExports="0" id="Trail Finish" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="8" size="107.861,186.385,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" itemRotation="0" id="Trail Finish" position="9.57644,5.42566,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="9.57644,5.42566,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" xmax="18.41187375074135701" ymin="-33.93243205975926458"/>
+        <Extent ymin="-33.93243205975926458" xmax="18.41187375074135701" ymax="-33.90007566747966905" xmin="18.39314911415855391"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="112.643,4.09761,mm" positionLock="true" type="65639" size="179.156,189.279,mm" positionOnPage="112.643,4.09761,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="7" frame="true" mapRotation="0" itemRotation="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" isTemporal="0" excludeFromExports="0" id="Trail Start" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="7" size="179.156,189.279,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" itemRotation="0" id="Trail Start" position="112.643,4.09761,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="112.643,4.09761,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" xmax="18.42354248737832023" ymin="-33.95772328900195447"/>
+        <Extent ymin="-33.95772328900195447" xmax="18.42354248737832023" ymax="-33.92484901666441743" xmin="18.3924263991010406"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" blendMode="0" drawCanvasItems="false" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="5.86559,4.09761,mm" positionLock="true" type="65639" size="67.7828,166.874,mm" positionOnPage="5.86559,4.09761,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="6" frame="true" mapRotation="0" itemRotation="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" isTemporal="0" excludeFromExports="0" id="Left inset 21KM" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="6" size="67.7828,166.874,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" itemRotation="0" id="Left inset 21KM" position="5.86559,4.09761,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
+        <Extent ymin="-33.94700000000000273" xmax="18.38626092146919788" ymax="-33.91681492292400435" xmin="18.37399999999999878"/>
         <LayerSet/>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="133.191,119.125,mm" positionLock="true" type="65639" size="113.3,76.1023,mm" positionOnPage="133.191,119.125,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="5" frame="true" mapRotation="0" itemRotation="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" isTemporal="0" excludeFromExports="0" id="Bottom inset 21KM" opacity="1">
-        <FrameColor green="34" blue="144" red="103" alpha="255"/>
-        <BackgroundColor green="175" blue="215" red="200" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="5" size="113.3,76.1023,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" itemRotation="0" id="Bottom inset 21KM" position="133.191,119.125,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="133.191,119.125,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="103" alpha="255" green="34" blue="144"/>
+        <BackgroundColor red="200" alpha="255" green="175" blue="215"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
+        <Extent ymin="-33.9168317482614512" xmax="18.42329132157224336" ymax="-33.91132718340826813" xmin="18.41509620662891678"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="19.6693,7.89412,mm" positionLock="true" type="65639" size="68.3676,117.12,mm" positionOnPage="19.6693,7.89412,mm" mapFlags="0" followPreset="true" visibility="0" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="4" frame="true" mapRotation="0" itemRotation="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" isTemporal="0" excludeFromExports="0" id="End inset Trail" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="0" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="4" size="68.3676,117.12,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" itemRotation="0" id="End inset Trail" position="19.6693,7.89412,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="19.6693,7.89412,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" xmax="18.41240136424316276" ymin="-33.91454383501641701"/>
+        <Extent ymin="-33.91454383501641701" xmax="18.41240136424316276" ymax="-33.90099106513847005" xmin="18.4044900556177744"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="170.062,49.6297,mm" positionLock="true" type="65639" size="63.655,88.3012,mm" positionOnPage="170.062,49.6297,mm" mapFlags="0" followPreset="true" visibility="0" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="3" frame="true" mapRotation="0" itemRotation="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" isTemporal="0" excludeFromExports="0" id="Start inset Trail" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="0" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="3" size="63.655,88.3012,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" itemRotation="0" id="Start inset Trail" position="170.062,49.6297,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="170.062,49.6297,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" xmax="18.4185691326545431" ymin="-33.94823764719958348"/>
+        <Extent ymin="-33.94823764719958348" xmax="18.4185691326545431" ymax="-33.94253141264477591" xmin="18.41445559427620893"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{917a530c-14f4-4ed8-b109-961939435221}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="200.321,125.314,mm" positionLock="true" type="65639" size="75.8756,69.7635,mm" positionOnPage="200.321,125.314,mm" mapFlags="0" followPreset="true" visibility="0" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="2" frame="true" mapRotation="0" itemRotation="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" isTemporal="0" excludeFromExports="0" id="Contour inset Trail" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="0" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="2" size="75.8756,69.7635,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" itemRotation="0" id="Contour inset Trail" position="200.321,125.314,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{917a530c-14f4-4ed8-b109-961939435221}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="200.321,125.314,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" xmax="18.42332635419156972" ymin="-33.95702588572736147"/>
+        <Extent ymin="-33.95702588572736147" xmax="18.42332635419156972" ymax="-33.94692690566557047" xmin="18.41234259163472942"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.15,mm" keepLayerSet="false" position="9.50144,5.50066,mm" positionLock="false" type="65639" size="282.372,186.105,mm" positionOnPage="9.50144,5.50066,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="round" referencePoint="0" labelMargin="0,mm" zValue="1" frame="true" mapRotation="0" itemRotation="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" isTemporal="0" excludeFromExports="0" id="Main Map" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="282.372,186.105,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" itemRotation="0" id="Main Map" position="9.50144,5.50066,mm" isTemporal="0" frameJoinStyle="round" opacity="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPresetName="Routes" followPreset="true" positionLock="false" labelMargin="0,mm" positionOnPage="9.50144,5.50066,mm" outlineWidthM="0.15,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89975491900725046" xmin="18.36400000000000077" xmax="18.45389078049076304" ymin="-33.95900000000000318"/>
+        <Extent ymin="-33.95900000000000318" xmax="18.45389078049076304" ymax="-33.89975491900725046" xmin="18.36400000000000077"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -33455,44 +33457,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -33515,40 +33517,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -33563,29 +33565,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33593,34 +33595,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" position="3" show="1" blendMode="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" inverted="0">
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <ComposerMapOverview inverted="0" position="3" centered="0" name="Overview 1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" show="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="alpha">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                    <Option type="int" name="type" value="3"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="alpha" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="103,34,144,26"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="103,34,144,26"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="103,34,144,26" k="color"/>
@@ -33635,9 +33637,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33645,9 +33647,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33655,63 +33657,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.06" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" sortAscending="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortFeatures="1" coverageLayerName="all_routes" filterFeatures="1" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" enabled="1" hideCoverage="0" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerName="all_routes" sortKey="&quot;Sort&quot;" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortAscending="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;"/>
     </Layout>
-    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -33726,49 +33728,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="594,841,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="594,841,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -33783,9 +33785,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33793,15 +33795,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="8" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="4,4,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="25.5925,18.7971,mm" background="true" frame="false" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="25.5925,18.7971,mm" frame="false" resizeToContents="1" size="4,4,mm" fontColor="#000000" zValue="8" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="25.5925,18.7971,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33809,37 +33811,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="1" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" legend_exp="" id="all_routes20170907054841602">
+            <layer-tree-layer expanded="1" patch_size="0,0" id="all_routes20170907054841602" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="QString" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="QString" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33847,47 +33849,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" blendMode="0" outlineWidthM="0.3,mm" position="5.2963,808.939,mm" positionLock="true" type="65641" size="91.9494,15.0649,mm" positionOnPage="5.2963,808.939,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="7" frame="false" labelText="MARSHAL POSITIONS" itemRotation="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="7" marginX="1" size="91.9494,15.0649,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginY="1" itemRotation="0" id="" position="5.2963,808.939,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" halign="1" positionLock="true" htmlState="0" positionOnPage="5.2963,808.939,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="MARSHAL POSITIONS">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33902,65 +33904,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" blendMode="0" outlineWidthM="0.3,mm" position="430.403,825.052,mm" positionLock="true" type="65641" size="56.6212,15.3656,mm" positionOnPage="430.403,825.052,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="REVISION 1.2" itemRotation="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="1" size="56.6212,15.3656,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginY="1" itemRotation="0" id="" position="430.403,825.052,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" halign="2" positionLock="true" htmlState="0" positionOnPage="430.403,825.052,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 1.2">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33975,65 +33977,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{d177957c-7ab6-40ae-8769-347428500538}" blendMode="0" outlineWidthM="0.3,mm" position="372.175,808.942,mm" positionLock="true" type="65641" size="114.848,15.0635,mm" positionOnPage="372.175,808.942,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" labelText="Sunday, 20 October 2019" itemRotation="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="4" marginX="1" size="114.848,15.0635,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginY="1" itemRotation="0" id="" position="372.175,808.942,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{d177957c-7ab6-40ae-8769-347428500538}" halign="2" positionLock="true" htmlState="0" positionOnPage="372.175,808.942,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Sunday, 20 October 2019">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34048,39 +34050,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="63.9757" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="489.557,775.395,mm" resizeMode="0" positionLock="true" type="65640" size="100.498,63.9757,mm" positionOnPage="489.557,775.395,mm" svgFillColor="255,255,255,255" anchorPoint="8" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" mode="1" itemRotation="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureWidth="63.5856" mapUuid="" excludeFromExports="0" file="../Gun_Run_Logo.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../Gun_Run_Logo.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="3" size="100.498,63.9757,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" itemRotation="0" id="" position="489.557,775.395,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" pictureHeight="63.9757" positionOnPage="489.557,775.395,mm" outlineWidthM="0.3,mm" pictureWidth="63.5856" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="8" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34088,42 +34090,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0" outlineWidthM="0.3,mm" position="5.4463,824.155,mm" positionLock="true" type="65643" size="481.428,0.606138,mm" positionOnPage="5.4463,824.155,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="2" frame="false" itemRotation="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="2" cornerRadiusMeasure="0,mm" size="481.428,0.606138,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" itemRotation="0" id="" position="5.4463,824.155,mm" frameJoinStyle="miter" opacity="1" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" shapeType="1" positionOnPage="5.4463,824.155,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -34138,90 +34140,90 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" blendMode="0" drawCanvasItems="false" followPresetName="Marshal plan" outlineWidthM="0.3,mm" keepLayerSet="false" position="3.94474,5.25965,mm" positionLock="true" type="65639" size="584.759,811.213,mm" positionOnPage="3.94474,5.25965,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="true" mapRotation="0" itemRotation="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="584.759,811.213,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0" id="" position="3.94474,5.25965,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPresetName="Marshal plan" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="3.94474,5.25965,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
+        <Extent ymin="-33.95821655848814657" xmax="18.42299397558693741" ymax="-33.89072661913806428" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="complete_marshal_overview" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="virtual" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" enabled="1" hideCoverage="1" coverageLayerName="complete_marshal_overview" sortKey="page" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;"/>
     </Layout>
-    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -34236,49 +34238,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -34293,9 +34295,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34305,15 +34307,15 @@ def my_form_open(dialog, layer, feature):
           <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="0" zValue="15" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="34.45,40.8,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="244.484,130.172,mm" background="true" frame="true" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="244.484,130.172,mm" minSymbolSize="0" excludeFromExports="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="185"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="244.484,130.172,mm" frame="true" resizeToContents="1" size="34.45,40.8,mm" fontColor="#000000" zValue="15" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="244.484,130.172,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="0" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="185" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34321,35 +34323,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Residents Access" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="residents_access_roads" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="residents_access_roads">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34357,47 +34359,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" blendMode="0" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" positionLock="true" type="65641" size="194.851,7.272,mm" positionOnPage="9.37446,191.81,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="ACCESS ROUTES FOR RESIDENTS" itemRotation="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="194.851,7.272,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginY="1" itemRotation="0" id="" position="9.37446,191.81,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" halign="1" positionLock="true" htmlState="0" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="14" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="14" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34412,65 +34414,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" blendMode="0" outlineWidthM="0.3,mm" position="204.225,191.81,mm" positionLock="true" type="65641" size="57.4836,6.8714,mm" positionOnPage="204.225,191.81,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="REVISION 1.1" itemRotation="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="1" size="57.4836,6.8714,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginY="1" itemRotation="0" id="" position="204.225,191.81,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" halign="2" positionLock="true" htmlState="0" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 1.1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34485,65 +34487,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" blendMode="0" outlineWidthM="0.3,mm" position="210.038,199.082,mm" positionLock="true" type="65641" size="51.6706,6.60801,mm" positionOnPage="210.038,199.082,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="Sunday, 20 October 2019" itemRotation="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="1" size="51.6706,6.60801,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginY="1" itemRotation="0" id="" position="210.038,199.082,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" halign="2" positionLock="true" htmlState="0" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Sunday, 20 October 2019">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34558,39 +34560,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="262.196,188.218,mm" resizeMode="0" positionLock="true" type="65640" size="29.7523,17.4718,mm" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255" anchorPoint="4" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="1" itemRotation="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureWidth="17.3653" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" file="../Gun_Run_Logo.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../Gun_Run_Logo.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="29.7523,17.4718,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" itemRotation="0" id="" position="262.196,188.218,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" pictureHeight="17.4718" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="17.3653" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="4" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34598,42 +34600,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" positionLock="true" type="65643" size="251.959,0.1,mm" positionOnPage="9.59946,198.832,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" itemRotation="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" itemRotation="0" id="" position="9.59946,198.832,mm" frameJoinStyle="miter" opacity="1" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" shapeType="1" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -34648,61 +34650,61 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" blendMode="0" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="5.86559,4.09761,mm" positionLock="true" type="65639" size="67.7828,166.874,mm" positionOnPage="5.86559,4.09761,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="2" frame="true" mapRotation="0" itemRotation="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="2" size="67.7828,166.874,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" itemRotation="0" id="" position="5.86559,4.09761,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPresetName="Access Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
+        <Extent ymin="-33.94652930000000168" xmax="18.38563681624126289" ymax="-33.91513741583252539" 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>
@@ -34717,45 +34719,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34786,44 +34788,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34846,40 +34848,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34894,29 +34896,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34924,45 +34926,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" blendMode="0" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.15,mm" keepLayerSet="false" position="9.44946,9.08557,mm" positionLock="true" type="65639" size="282.012,175.592,mm" positionOnPage="9.44946,9.08557,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="round" referencePoint="0" labelMargin="0,mm" zValue="1" frame="true" mapRotation="0" itemRotation="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="282.012,175.592,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" itemRotation="0" id="" position="9.44946,9.08557,mm" isTemporal="0" frameJoinStyle="round" opacity="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPresetName="Access Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" xmax="18.42303507276415431" ymin="-33.92999999999999972"/>
+        <Extent ymin="-33.92999999999999972" xmax="18.42303507276415431" ymax="-33.89697816224119009" 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>
@@ -34977,45 +34979,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -35046,44 +35048,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -35106,40 +35108,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -35154,29 +35156,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35184,56 +35186,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" sortFeatures="0" coverageLayerName="residents_access" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="1" hideCoverage="1" coverageLayerName="residents_access" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
-    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -35248,49 +35250,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -35305,9 +35307,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35317,47 +35319,47 @@ def my_form_open(dialog, layer, feature):
           <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" valign="64" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" blendMode="0" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" positionLock="true" type="65641" size="194.851,7.272,mm" positionOnPage="9.37446,191.81,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="Access to P9 Parking and VIP Tent" itemRotation="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="194.851,7.272,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginY="1" itemRotation="0" id="" position="9.37446,191.81,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" halign="1" positionLock="true" htmlState="0" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Access to P9 Parking and VIP Tent">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="14" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="14" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35372,65 +35374,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" blendMode="0" outlineWidthM="0.3,mm" position="204.225,191.81,mm" positionLock="true" type="65641" size="57.4836,6.8714,mm" positionOnPage="204.225,191.81,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="REVISION 1.0" itemRotation="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="1" size="57.4836,6.8714,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginY="1" itemRotation="0" id="" position="204.225,191.81,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" halign="2" positionLock="true" htmlState="0" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 1.0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35445,65 +35447,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" blendMode="0" outlineWidthM="0.3,mm" position="210.038,199.082,mm" positionLock="true" type="65641" size="51.6706,6.60801,mm" positionOnPage="210.038,199.082,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="Sunday, 20 October 2019" itemRotation="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="1" size="51.6706,6.60801,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginY="1" itemRotation="0" id="" position="210.038,199.082,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" halign="2" positionLock="true" htmlState="0" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Sunday, 20 October 2019">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35518,39 +35520,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="262.196,188.218,mm" resizeMode="0" positionLock="true" type="65640" size="29.7523,17.4718,mm" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255" anchorPoint="4" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="1" itemRotation="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureWidth="17.3653" mapUuid="" excludeFromExports="0" file="../Gun_Run_Logo.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../Gun_Run_Logo.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="29.7523,17.4718,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" itemRotation="0" id="" position="262.196,188.218,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" pictureHeight="17.4718" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="17.3653" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="4" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35558,42 +35560,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" positionLock="true" type="65643" size="251.959,0.1,mm" positionOnPage="9.59946,198.832,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" itemRotation="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" itemRotation="0" id="" position="9.59946,198.832,mm" frameJoinStyle="miter" opacity="1" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" shapeType="1" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -35608,46 +35610,46 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" blendMode="0" drawCanvasItems="false" followPresetName="" outlineWidthM="0.15,mm" keepLayerSet="false" position="9.44946,7.25098,mm" positionLock="false" type="65639" size="282.012,182.649,mm" positionOnPage="9.44946,7.25098,mm" mapFlags="0" followPreset="false" visibility="1" groupUuid="" frameJoinStyle="round" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="282.012,182.649,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" itemRotation="0" id="" position="9.44946,7.25098,mm" isTemporal="0" frameJoinStyle="round" opacity="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPresetName="" followPreset="false" positionLock="false" labelMargin="0,mm" positionOnPage="9.44946,7.25098,mm" outlineWidthM="0.15,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" xmax="18.40919746780259914" ymin="-33.90848231674397084"/>
+        <Extent ymin="-33.90848231674397084" xmax="18.40919746780259914" ymax="-33.90319854486631357" 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>
@@ -35662,45 +35664,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -35731,44 +35733,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -35791,40 +35793,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -35839,29 +35841,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35869,56 +35871,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" sortFeatures="0" coverageLayerName="residents_access" filterFeatures="0" enabled="0"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="0" hideCoverage="1" coverageLayerName="residents_access" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
-    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -35933,49 +35935,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,420,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,420,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -35990,9 +35992,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -36000,47 +36002,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem background="false" valign="32" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" blendMode="0" outlineWidthM="0.3,mm" position="112.086,406.476,mm" positionLock="true" type="65641" size="23.5967,8.3142,mm" positionOnPage="112.086,406.476,mm" marginY="1" visibility="1" htmlState="1" groupUuid="" halign="4" frameJoinStyle="miter" referencePoint="0" zValue="9" frame="false" labelText="Page [% &quot;page&quot; %] " itemRotation="0" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="9" marginX="0" size="23.5967,8.3142,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" marginY="1" itemRotation="0" id="" position="112.086,406.476,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" halign="4" positionLock="true" htmlState="1" positionOnPage="112.086,406.476,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Page [% &quot;page&quot; %] ">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36055,65 +36057,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" blendMode="0" outlineWidthM="0.3,mm" position="214.292,406.874,mm" positionLock="true" type="65641" size="27.7839,7.51682,mm" positionOnPage="214.292,406.874,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="REVISION 4.1" itemRotation="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="27.7839,7.51682,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginY="1" itemRotation="0" id="" position="214.292,406.874,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" halign="2" positionLock="true" htmlState="0" positionOnPage="214.292,406.874,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 4.1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36128,33 +36130,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="7" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="21.6797,33,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="15.6525,12.5708,mm" background="true" frame="false" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="15.6525,12.5708,mm" frame="false" resizeToContents="1" size="21.6797,33,mm" fontColor="#000000" zValue="7" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="15.6525,12.5708,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36162,37 +36164,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="1" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -36200,47 +36202,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" blendMode="0" outlineWidthM="0.3,mm" position="5.69321,398.344,mm" positionLock="true" type="65641" size="45.1194,8.13137,mm" positionOnPage="5.69321,398.344,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="MARSHAL POSITIONS" itemRotation="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="0" size="45.1194,8.13137,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginY="1" itemRotation="0" id="" position="5.69321,398.344,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" halign="1" positionLock="true" htmlState="0" positionOnPage="5.69321,398.344,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="MARSHAL POSITIONS">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36255,65 +36257,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" blendMode="0" outlineWidthM="0.3,mm" position="5.69321,406.988,mm" positionLock="true" type="65641" size="118.192,7.80192,mm" positionOnPage="5.69321,406.988,mm" marginY="1" visibility="1" htmlState="1" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" 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>" itemRotation="0" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="0" size="118.192,7.80192,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" marginY="1" itemRotation="0" id="" position="5.69321,406.988,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" halign="1" positionLock="true" htmlState="1" positionOnPage="5.69321,406.988,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="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>">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36328,65 +36330,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" blendMode="0" outlineWidthM="0.3,mm" position="148.501,398.344,mm" positionLock="true" type="65641" size="93.5757,8.13167,mm" positionOnPage="148.501,398.344,mm" marginY="1" visibility="1" htmlState="1" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" 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>" itemRotation="0" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="4" marginX="0" size="93.5757,8.13167,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" marginY="1" itemRotation="0" id="" position="148.501,398.344,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" halign="2" positionLock="true" htmlState="1" positionOnPage="148.501,398.344,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="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>">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36401,39 +36403,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="26.4325" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="243.319,382.696,mm" resizeMode="0" positionLock="true" type="65640" size="49.3143,31.2967,mm" positionOnPage="243.319,382.696,mm" svgFillColor="255,255,255,255" anchorPoint="8" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" mode="1" itemRotation="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureWidth="49.3143" mapUuid="" excludeFromExports="0" file="../GunRun2022_250.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_250.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="3" size="49.3143,31.2967,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" itemRotation="0" id="" position="243.319,382.696,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionLock="true" pictureHeight="26.4325" positionOnPage="243.319,382.696,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="8" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36441,42 +36443,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" blendMode="0" outlineWidthM="0.3,mm" position="5.84321,406.626,mm" positionLock="true" type="65643" size="236.083,0.14328,mm" positionOnPage="5.84321,406.626,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="2" frame="false" itemRotation="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="2" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" itemRotation="0" id="" position="5.84321,406.626,mm" frameJoinStyle="miter" opacity="1" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" shapeType="1" positionOnPage="5.84321,406.626,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -36491,97 +36493,97 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" blendMode="0" drawCanvasItems="false" followPresetName="Marshal plan" outlineWidthM="0.3,mm" keepLayerSet="false" position="5.03,5.9483,mm" positionLock="true" type="65639" size="286.94,392.396,mm" positionOnPage="5.03,5.9483,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="286.94,392.396,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0" id="" position="5.03,5.9483,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" followPresetName="Marshal plan" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.9248732774534929" xmin="18.36924763341120581" xmax="18.38613924055453452" ymin="-33.94797288016832226"/>
+        <Extent ymin="-33.94797288016832226" xmax="18.38613924055453452" ymax="-33.9248732774534929" xmin="18.36924763341120581"/>
         <LayerSet/>
-        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="marshal_overviews" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" enabled="1" hideCoverage="1" coverageLayerName="marshal_overviews" sortKey="page" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;"/>
     </Layout>
-    <Layout name="Fencing - Cones only" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Fencing - Cones only" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -36596,49 +36598,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -36653,9 +36655,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -36663,15 +36665,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="11" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="38.1563,53.7608,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="256.808,5.21277,mm" background="true" frame="true" resizeToContents="0" visibility="1" legendFilterByAtlas="0" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="256.808,5.21277,mm" frame="true" resizeToContents="0" size="38.1563,53.7608,mm" fontColor="#000000" zValue="11" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="256.808,5.21277,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36679,53 +36681,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="Bold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="Bold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="fencing" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option type="QString" name="legend/expressionFilter" value=""/>
-                  <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-                  <Option type="QString" name="legend/node-order" value="1,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -36733,47 +36735,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" positionLock="true" type="65641" size="148.46,6.45211,mm" positionOnPage="6.76779,191.188,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="10" frame="false" labelText="CONES: [% &quot;name&quot; %]" itemRotation="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="10" marginX="0" size="148.46,6.45211,mm" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" marginY="0" itemRotation="0" id="" position="6.76779,191.188,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" halign="1" positionLock="true" htmlState="0" positionOnPage="6.76779,191.188,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="CONES: [% &quot;name&quot; %]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36788,65 +36790,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" blendMode="0" outlineWidthM="0.3,mm" position="182.723,191.188,mm" positionLock="true" type="65641" size="56.3557,6.45237,mm" positionOnPage="182.723,191.188,mm" marginY="0" visibility="1" htmlState="1" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="9" frame="false" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" itemRotation="0" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="9" marginX="0" size="56.3557,6.45237,mm" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" marginY="0" itemRotation="0" id="" position="182.723,191.188,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" halign="2" positionLock="true" htmlState="1" positionOnPage="182.723,191.188,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36861,65 +36863,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" blendMode="0" outlineWidthM="0.3,mm" position="209.146,198.083,mm" positionLock="true" type="65641" size="26.8205,6.82826,mm" positionOnPage="209.146,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="REVISION 2.1" itemRotation="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="26.8205,6.82826,mm" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" marginY="0" itemRotation="0" id="" position="209.146,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" halign="2" positionLock="true" htmlState="0" positionOnPage="209.146,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 2.1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36934,65 +36936,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" blendMode="0" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" positionLock="true" type="65641" size="51.1638,7.07327,mm" positionOnPage="62.6706,198.083,mm" marginY="1" visibility="0" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="7" frame="false" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="0" background="false" excludeFromExports="0" groupUuid="" zValue="7" marginX="1" size="51.1638,7.07327,mm" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" marginY="1" itemRotation="0" id="" position="62.6706,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" halign="1" positionLock="true" htmlState="0" positionOnPage="62.6706,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -37007,65 +37009,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" blendMode="0" outlineWidthM="0.3,mm" position="116.805,198.083,mm" positionLock="true" type="65641" size="64.7594,7.10512,mm" positionOnPage="116.805,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="0" size="64.7594,7.10512,mm" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" marginY="0" itemRotation="0" id="" position="116.805,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" halign="1" positionLock="true" htmlState="0" positionOnPage="116.805,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -37080,65 +37082,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" positionLock="true" type="65641" size="90.2083,7.07327,mm" positionOnPage="6.76779,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="0" size="90.2083,7.07327,mm" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" marginY="0" itemRotation="0" id="" position="6.76779,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" halign="1" positionLock="true" htmlState="0" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Page [% @atlas_featurenumber %]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -37153,39 +37155,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="26.4325" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="243.098,175.353,mm" resizeMode="0" positionLock="true" type="65640" size="49.3143,29.8354,mm" positionOnPage="243.098,175.353,mm" svgFillColor="255,255,255,255" anchorPoint="8" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="1" itemRotation="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" pictureWidth="49.3143" mapUuid="" excludeFromExports="0" file="../GunRun2022_250.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_250.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="49.3143,29.8354,mm" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" itemRotation="0" id="" position="243.098,175.353,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" positionLock="true" pictureHeight="26.4325" positionOnPage="243.098,175.353,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="8" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37193,42 +37195,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" blendMode="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" positionLock="true" type="65643" size="232.01,0.14328,mm" positionOnPage="6.91779,197.79,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" itemRotation="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" itemRotation="0" id="" position="6.91779,197.79,mm" frameJoinStyle="miter" opacity="1" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" shapeType="1" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -37243,55 +37245,55 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem unitType="meters" type="65646" groupUuid="" labelHorizontalPlacement="0" numSegments="2" labelVerticalPlacement="0" zValue="2" numUnitsPerSegment="30" lineCapStyle="square" itemRotation="0" labelBarSpace="1" size="84.9787,15.8378,mm" referencePoint="0" numSegmentsLeft="2" segmentMillimeters="25.0725" positionLock="true" style="Double Box" blendMode="0" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" unitLabel="m" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" numSubdivisions="1" background="false" minBarWidth="25" frame="false" lineJoinStyle="round" visibility="1" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" opacity="1" maxBarWidth="100" subdivisionsHeight="1.5" alignment="0" segmentSizeMode="1" id="" frameJoinStyle="miter" outlineWidth="0.2" height="2" boxContentSpace="0.2" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem unitType="meters" subdivisionsHeight="1.5" positionOnPage="6.76779,2.8482,mm" frame="false" size="109.51,15.8378,mm" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" labelVerticalPlacement="0" numSegmentsLeft="2" zValue="2" itemRotation="0" positionLock="true" numMapUnitsPerScaleBarUnit="1" labelHorizontalPlacement="0" frameJoinStyle="miter" labelBarSpace="1" visibility="1" maxBarWidth="100" outlineWidthM="0.3,mm" height="2" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" boxContentSpace="0.2" referencePoint="0" opacity="1" groupUuid="" numSegments="2" numSubdivisions="1" outlineWidth="0.2" excludeFromExports="0" position="6.76779,2.8482,mm" lineCapStyle="square" unitLabel="m" id="" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" blendMode="0" lineJoinStyle="round" segmentSizeMode="1" alignment="0" numUnitsPerSegment="20" background="false" minBarWidth="25" type="65646" style="Double Box" segmentMillimeters="33.2496">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -37306,75 +37308,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" red="0" alpha="255"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <Option name="decimal_separator" type="QChar" value=""/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="QChar" value=""/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" red="0" alpha="255"/>
-        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -37405,52 +37407,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -37481,52 +37483,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -37557,36 +37559,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -37601,36 +37603,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -37645,53 +37647,53 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem background="false" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" blendMode="0" drawCanvasItems="false" followPresetName="Cones" outlineWidthM="0.3,mm" keepLayerSet="false" position="6.76779,9.35102,mm" positionLock="true" type="65639" size="283.418,180.92,mm" positionOnPage="6.76779,9.35102,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" isTemporal="0" excludeFromExports="0" id="" opacity="0.9">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="false" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="283.418,180.92,mm" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" id="" position="6.76779,9.35102,mm" isTemporal="0" frameJoinStyle="miter" opacity="0.9" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" followPresetName="Cones" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" name="exponent" value="1"/>
-                      <Option type="double" name="maxOutput" value="360"/>
-                      <Option type="double" name="maxValue" value="0"/>
-                      <Option type="double" name="minOutput" value="0"/>
-                      <Option type="double" name="minValue" value="0"/>
-                      <Option type="double" name="nullOutput" value="0"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option type="int" name="t" value="0"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option type="int" name="type" value="3"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90025472328818523" xmin="18.40670677609454486" xmax="18.40975312970198985" ymin="-33.90219936134110412"/>
+        <Extent ymin="-33.90817940102677852" xmax="18.40522072458854552" ymax="-33.90720180625849167" xmin="18.40368928312333452"/>
         <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>
@@ -37706,45 +37708,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" leftAnnotationDisplay="3" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="1" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="5" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="4" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridStyle="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="5" topAnnotationDisplay="3" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="4" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="5" topAnnotationDisplay="3" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationDirection="0" blendMode="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedTicksEnabled="0" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="3" intervalY="5" leftFrameDivisions="0" unit="1" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -37775,44 +37777,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -37835,9 +37837,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -37854,32 +37856,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -37894,29 +37896,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -37924,46 +37926,46 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="true"/>
-          <Option type="bool" name="singleFile" value="true"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="cone_only_groups" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="virtual" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" enabled="1" hideCoverage="1" coverageLayerName="cone_only_groups" sortKey="&quot;group&quot;" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.91765693375520385" xmin="18.38526494898227526" xmax="18.38637629180237809" ymin="-33.91825474477089841">
+    <DefaultViewExtent ymin="-33.91808582923300719" xmax="18.38599917804337025" ymax="-33.91748801821731263" xmin="18.38488783522326742">
       <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>
@@ -37977,10 +37979,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h" frameRate="1"/>
+  <ProjectTimeSettings timeStepUnit="h" timeStep="1" frameRate="1" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -37989,29 +37991,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="QChar" name="decimal_separator" value=""/>
-        <Option type="int" name="decimals" value="6"/>
-        <Option type="int" name="direction_format" value="0"/>
-        <Option type="int" name="rounding_type" value="0"/>
-        <Option type="bool" name="show_plus" value="false"/>
-        <Option type="bool" name="show_thousand_separator" value="true"/>
-        <Option type="bool" name="show_trailing_zeros" value="false"/>
-        <Option type="QChar" name="thousand_separator" value=""/>
+        <Option name="decimal_separator" type="QChar" value=""/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="direction_format" type="int" value="0"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="QChar" value=""/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option type="QString" name="angle_format" value="DecimalDegrees"/>
-        <Option type="QChar" name="decimal_separator" value=""/>
-        <Option type="int" name="decimals" value="6"/>
-        <Option type="int" name="rounding_type" value="0"/>
-        <Option type="bool" name="show_leading_degree_zeros" value="false"/>
-        <Option type="bool" name="show_leading_zeros" value="false"/>
-        <Option type="bool" name="show_plus" value="false"/>
-        <Option type="bool" name="show_suffix" value="false"/>
-        <Option type="bool" name="show_thousand_separator" value="true"/>
-        <Option type="bool" name="show_trailing_zeros" value="false"/>
-        <Option type="QChar" name="thousand_separator" value=""/>
+        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
+        <Option name="decimal_separator" type="QChar" value=""/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
+        <Option name="show_leading_zeros" type="bool" value="false"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_suffix" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="QChar" value=""/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 1e4c3b2..b499c37 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 saveUser="tim" version="3.26.3-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run" saveDateTime="2022-09-13T10:52:23">
+<qgis version="3.26.3-Buenos Aires" saveDateTime="2022-09-13T14:35:18" saveUserFull="Timothy Allen" saveUser="tim" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,256 +21,257 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Checked" name="Marshals" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Marshals" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="marshal_positions" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="marshal_positions [460]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-            <Option type="int" name="showFeatureCount" value="1"/>
+            <Option name="cached_name" type="QString" value="marshal_positions [460]"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="extra_security" expanded="1" source="./extra_security.shp" legend_exp="" id="extra_security20170921130834191" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./extra_security.shp" id="extra_security20170921130834191" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="extra_security">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="marshals_by_position" expanded="1" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" id="marshals_by_position20161003112326575" providerKey="delimitedtext">
+      <layer-tree-layer providerKey="delimitedtext" expanded="1" patch_size="0,0" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" id="marshals_by_position20161003112326575" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="marshals_by_position">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="marshals_by_position"/>
+            <Option name="cached_name" type="QString" value="marshals_by_position"/>
+            <Option name="showFeatureCount" type="int" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="complete_marshal_overview" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual">
+      <layer-tree-layer providerKey="virtual" expanded="1" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="complete_marshal_overview">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="marshal_overviews" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="0" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="marshal_overviews">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="fencing" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="fencing">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="fencing"/>
-            <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-            <Option type="QString" name="legend/expressionFilter" value=""/>
-            <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
+            <Option name="cached_name" type="QString" value="fencing"/>
+            <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+            <Option name="legend/expressionFilter" type="QString" value=""/>
+            <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" patch_size="-1,-1" legend_split_behavior="0" name="cone_only_groups" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" legend_exp="" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual">
+      <layer-tree-layer providerKey="virtual" expanded="1" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="cone_only_groups">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="-1,-1" legend_split_behavior="0" name="fence_and_cone_groups" expanded="1" 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" legend_exp="" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual">
+      <layer-tree-layer providerKey="virtual" expanded="1" patch_size="-1,-1" 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" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="fence_and_cone_groups">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group checked="Qt::Checked" name="Markers" expanded="1" groupLayer="">
+      <layer-tree-group expanded="1" checked="Qt::Checked" name="Markers" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer checked="Qt::Checked" patch_size="-1,-1" legend_split_behavior="0" name="route_markers" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=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={3ca1439b-1443-4540-aaff-f2005b5a5ee8}" legend_exp="" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" providerKey="memory">
+        <layer-tree-layer providerKey="memory" expanded="1" patch_size="-1,-1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=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={db62f167-3190-46c0-ae06-2db51050a620}" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="route_markers">
           <customproperties>
             <Option type="Map">
-              <Option type="QString" name="cached_name" value="route_markers"/>
+              <Option name="cached_name" type="QString" value="route_markers"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="all_routes"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="int" name="showFeatureCount" value="0"/>
+            <Option name="cached_name" type="QString" value="all_routes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" type="int" value="0"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="timelapse" expanded="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " legend_exp="" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr">
+    <layer-tree-layer providerKey="ogr" expanded="0" patch_size="0,0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="timelapse">
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="cached_name" value="timelapse"/>
+          <Option name="cached_name" type="QString" value="timelapse"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group checked="Qt::Checked" name="Feeding Stations" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Feeding Stations" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="water_tables" expanded="1" source="./water_tables.shp" legend_exp="" id="water_tables20170921142016467" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./water_tables.shp" id="water_tables20170921142016467" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="water_tables">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="water_tables"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="water_tables"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Ask Me" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Ask Me" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="poi_labels" expanded="1" source="./poi_labels.shp|layername=poi_labels" legend_exp="" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="poi_labels">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="poi_labels"/>
+            <Option name="cached_name" type="QString" value="poi_labels"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="directions_to_start" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="directions_to_start">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="directions_to_start"/>
+            <Option name="cached_name" type="QString" value="directions_to_start"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Residents Access" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Residents Access" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="mayor" expanded="1" source="./mayor.shp" legend_exp="" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./mayor.shp" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="mayor">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="mayor"/>
+            <Option name="cached_name" type="QString" value="mayor"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="viplabels" expanded="1" source="./viplabels.shp" legend_exp="" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./viplabels.shp" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="viplabels">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="viplabels"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="viplabels"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="vipaccess" expanded="1" source="./vipaccess.shp" legend_exp="" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./vipaccess.shp" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="vipaccess">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="vipaccess"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="vipaccess"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="golfaccess" expanded="0" source="./golfaccess.shp" legend_exp="" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="0" patch_size="0,0" source="./golfaccess.shp" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="golfaccess">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="residents_access_roads" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="residents_access_roads"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="residents_access_roads"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="residents_access" expanded="1" source="./residents_access.shp|layername=residents_access" legend_exp="" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./residents_access.shp|layername=residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="OSM data" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="OSM data" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="osm_roads" expanded="0" source="./osm_roads.shp" legend_exp="" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="0" patch_size="0,0" source="./osm_roads.shp" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="osm_roads">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="osm_roads [3887]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option name="cached_name" type="QString" value="osm_roads [3887]"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="osm_places" expanded="1" source="./osm_places.shp|layername=osm_places" legend_exp="" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./osm_places.shp|layername=osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="osm_places">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="osm_places [7]"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option name="cached_name" type="QString" value="osm_places [7]"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Unchecked" name="Start and Finish pages" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="data-comments" expanded="1" source="./data-comments.shp" legend_exp="" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./data-comments.shp" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="data-comments">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="start_finish_area" expanded="1" source="./start_finish_area.shp" legend_exp="" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./start_finish_area.shp" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="start_finish_area">
         <customproperties>
           <Option type="Map">
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Elevation" expanded="0" groupLayer="">
+    <layer-tree-group expanded="0" checked="Qt::Unchecked" name="Elevation" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" patch_size="0,0" legend_split_behavior="0" name="capetownelevation-1m" expanded="1" source="./capetownelevation-1m.shp" legend_exp="" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr">
+      <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./capetownelevation-1m.shp" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_split_behavior="0" checked="Qt::Unchecked" legend_exp="" name="capetownelevation-1m">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="showFeatureCount" value="1"/>
+            <Option name="showFeatureCount" type="QString" value="1"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Map" expanded="1" groupLayer="">
+    <layer-tree-group expanded="1" checked="Qt::Checked" name="Map" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal">
+      <layer-tree-layer providerKey="gdal" expanded="0" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="GDAL-City of Cape Town 2015 Aerial"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="GDAL-City of Cape Town 2015 Aerial"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="Outlines" expanded="1" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" legend_exp="" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms">
+      <layer-tree-layer providerKey="wms" expanded="1" patch_size="0,0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="Outlines">
         <customproperties>
           <Option type="Map">
-            <Option type="QString" name="cached_name" value="Outlines"/>
-            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option name="cached_name" type="QString" value="Outlines"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -304,32 +305,32 @@
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" minScale="0" type="1" tolerance="10" mode="3" self-snapping="1" scaleDependencyMode="0" enabled="0" intersection-snapping="1" maxScale="0">
+  <snapping-settings self-snapping="1" enabled="0" scaleDependencyMode="0" unit="1" intersection-snapping="1" tolerance="10" minScale="0" maxScale="0" mode="3" type="1">
     <individual-layer-settings>
-      <layer-setting minScale="0" type="1" tolerance="12" units="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="20" units="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="0" tolerance="12" units="1" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="0" units="2" id="water_tables20170921142016467" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="0" tolerance="12" units="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="1" tolerance="12" units="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="1" tolerance="12" units="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="0" units="2" id="extra_security20170921130834191" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="1" tolerance="12" units="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="0" tolerance="12" units="1" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" maxScale="0"/>
-      <layer-setting minScale="0" type="2" tolerance="12" units="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" maxScale="0"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" type="0" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="0" minScale="0" maxScale="0" id="water_tables20170921142016467" type="2" units="2"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" units="1"/>
+      <layer-setting enabled="1" tolerance="20" minScale="0" maxScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="0" minScale="0" maxScale="0" id="extra_security20170921130834191" type="2" units="2"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" type="0" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" type="0" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" units="1"/>
+      <layer-setting enabled="0" tolerance="12" minScale="0" maxScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -337,10 +338,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.38526494898227526</xmin>
-      <ymin>-33.91824698446153263</ymin>
-      <xmax>18.38637629180237809</xmax>
-      <ymax>-33.91766469406456963</ymax>
+      <xmin>18.38527851936375512</xmin>
+      <ymin>-33.91824698446152553</ymin>
+      <xmax>18.38638986218385796</xmax>
+      <ymax>-33.91766469406456252</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -362,165 +363,165 @@
   <projectModels/>
   <legend updateDrawingOrder="true">
     <legendgroup checked="Qt::Checked" name="Marshals" open="true">
-      <legendlayer checked="Qt::Checked" name="marshal_positions" showFeatureCount="1" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" name="marshal_positions" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="extra_security" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="extra_security" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="marshals_by_position" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked" name="marshals_by_position" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="complete_marshal_overview" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="marshal_overviews" showFeatureCount="0" drawingOrder="-1" open="false">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="marshal_overviews" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" name="Fencing and Cones" open="true">
-      <legendlayer checked="Qt::Checked" name="fencing" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="fencing" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="cone_only_groups" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="cone_only_groups" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="fence_and_cone_groups" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" name="Routes" open="true">
       <legendgroup checked="Qt::Checked" name="Markers" open="true">
-        <legendlayer checked="Qt::Checked" name="route_markers" showFeatureCount="0" drawingOrder="-1" open="true">
+        <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="route_markers" open="true">
           <filegroup hidden="false" open="true">
-            <legendlayerfile layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" isInOverview="0" visible="1"/>
+            <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" name="all_routes" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="all_routes" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" name="timelapse" showFeatureCount="0" drawingOrder="-1" open="false">
+    <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="timelapse" open="false">
       <filegroup hidden="false" open="false">
-        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
+        <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
     <legendgroup checked="Qt::Checked" name="Feeding Stations" open="true">
-      <legendlayer checked="Qt::Checked" name="water_tables" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="water_tables" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
-      <legendlayer checked="Qt::Unchecked" name="poi_labels" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="poi_labels" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="directions_to_start" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
-      <legendlayer checked="Qt::Unchecked" name="mayor" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="mayor" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="viplabels" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="viplabels" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="vipaccess" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="vipaccess" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="golfaccess" showFeatureCount="0" drawingOrder="-1" open="false">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="golfaccess" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="residents_access_roads" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="residents_access" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="residents_access" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" name="OSM data" open="true">
-      <legendlayer checked="Qt::Checked" name="osm_roads" showFeatureCount="1" drawingOrder="-1" open="false">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" name="osm_roads" open="false">
         <filegroup hidden="false" open="false">
-          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="osm_places" showFeatureCount="1" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Checked" name="osm_places" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
-      <legendlayer checked="Qt::Unchecked" name="data-comments" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" name="data-comments" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" name="start_finish_area" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Unchecked" 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"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
-      <legendlayer checked="Qt::Unchecked" name="capetownelevation-1m" showFeatureCount="1" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="1" checked="Qt::Unchecked" name="capetownelevation-1m" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
+          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
     <legendgroup checked="Qt::Checked" name="Map" open="true">
-      <legendlayer checked="Qt::Checked" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" drawingOrder="-1" open="false">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" 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"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" name="Outlines" showFeatureCount="0" drawingOrder="-1" open="true">
+      <legendlayer drawingOrder="-1" showFeatureCount="0" checked="Qt::Checked" name="Outlines" open="true">
         <filegroup hidden="false" open="true">
-          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
+          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshTime="0" type="annotation" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="">
+  <main-annotation-layer refreshOnNotifyMessage="" autoRefreshTime="0" autoRefreshEnabled="0" legendPlaceholderImage="" type="annotation" refreshOnNotifyEnabled="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -571,7 +572,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" legendPlaceholderImage="" maxScale="100000">
+    <maplayer refreshOnNotifyMessage="" autoRefreshTime="0" maxScale="100000" minScale="1e+08" autoRefreshEnabled="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="raster" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -636,7 +637,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -647,9 +648,9 @@
       </resourceMetadata>
       <provider>gdal</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
-        <noDataList bandNo="2" useSrcNoData="0"/>
-        <noDataList bandNo="3" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
+        <noDataList useSrcNoData="0" bandNo="2"/>
+        <noDataList useSrcNoData="0" bandNo="3"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -661,58 +662,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" symbology="Line" zscale="1" enabled="0">
+      <elevation enabled="0" band="1" symbology="Line" zoffset="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="152,125,183,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -743,36 +744,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -787,9 +788,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -798,27 +799,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="WMSBackgroundLayer" value="false"/>
-          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="identify/format" value="Value"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="false"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Value"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" name="name" value=""/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option type="QString" name="type" value="collection"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer redBand="1" greenBand="2" type="multibandcolor" blueBand="3" nodataColor="" alphaBand="-1" opacity="0.5">
+        <rasterrenderer redBand="1" alphaBand="-1" nodataColor="" greenBand="2" opacity="0.5" blueBand="3" type="multibandcolor">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -829,14 +830,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
-        <huesaturation colorizeRed="255" colorizeBlue="128" saturation="0" colorizeGreen="128" colorizeOn="0" colorizeStrength="100" grayscaleMode="0" invertColors="0"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation saturation="0" colorizeGreen="128" colorizeStrength="100" colorizeBlue="128" colorizeRed="255" invertColors="0" colorizeOn="0" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" legendPlaceholderImage="" maxScale="0">
+    <maplayer refreshOnNotifyMessage="" autoRefreshTime="0" maxScale="0" minScale="1e+08" autoRefreshEnabled="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" type="raster" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -901,7 +902,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -912,7 +913,7 @@
       </resourceMetadata>
       <provider>wms</provider>
       <noData>
-        <noDataList bandNo="1" useSrcNoData="0"/>
+        <noDataList useSrcNoData="0" bandNo="1"/>
       </noData>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -924,58 +925,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" band="1" symbology="Line" zscale="1" enabled="0">
+      <elevation enabled="0" band="1" symbology="Line" zoffset="0" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1006,36 +1007,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -1050,9 +1051,9 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1061,27 +1062,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="WMSBackgroundLayer" value="true"/>
-          <Option type="QString" name="WMSPublishDataSourceUrl" value="false"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="identify/format" value="Undefined"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="WMSBackgroundLayer" type="QString" value="true"/>
+          <Option name="WMSPublishDataSourceUrl" type="QString" value="false"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="identify/format" type="QString" value="Undefined"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option type="QString" name="name" value=""/>
+          <Option name="name" type="QString" value=""/>
           <Option name="properties"/>
-          <Option type="QString" name="type" value="collection"/>
+          <Option name="type" type="QString" value="collection"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling enabled="false" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer type="singlebandcolordata" nodataColor="" band="1" alphaBand="-1" opacity="0.75">
+        <rasterrenderer alphaBand="-1" nodataColor="" band="1" opacity="0.75" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1092,14 +1093,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
-        <huesaturation colorizeRed="255" colorizeBlue="128" saturation="0" colorizeGreen="128" colorizeOn="0" colorizeStrength="100" grayscaleMode="0" invertColors="0"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation saturation="0" colorizeGreen="128" colorizeStrength="100" colorizeBlue="128" colorizeRed="255" invertColors="0" colorizeOn="0" grayscaleMode="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1164,7 +1165,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1178,8 +1179,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" comment="" expression="$length * 100" name="length_km" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="$length * 100 * 1000" name="length_m" type="6" subType="0" precision="0" typeName="double precision"/>
+        <field comment="" length="-1" expression="$length * 100" name="length_km" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="$length * 100 * 1000" name="length_m" precision="0" type="6" typeName="double precision" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1192,58 +1193,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="RouteLen" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="RouteLen" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="229,182,54,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1274,36 +1275,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -1318,44 +1319,44 @@
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -1378,59 +1379,59 @@
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule checkstate="0" label="Active Routes" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" symbol="0" description="Only show when active in Atlas" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule checkstate="0" label="21KM" filter="&quot;Source&quot; = '21KM'" symbol="1" description="This should be disabled, since it's only for legends" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule checkstate="0" label="10KM" filter="&quot;Source&quot; = '10KM'" symbol="2" description="This should be disabled, since it's only for legends" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule checkstate="0" label="5KM" filter="&quot;Source&quot; = '5KM'" symbol="3" description="This should be disabled, since it's only for legends" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule checkstate="0" label="Trail" filter="&quot;Source&quot; = 'Trail'" symbol="4" description="This should be disabled, since it's only for legends" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <rule key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" symbol="0" label="Active Routes" description="Only show when active in Atlas" checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )">
+            <rule key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" symbol="1" label="21KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '21KM'"/>
+            <rule key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" symbol="2" label="10KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '10KM'"/>
+            <rule key="{bdafe9b2-4918-427d-89be-41870f96981f}" symbol="3" label="5KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '5KM'"/>
+            <rule key="{151f553a-04cc-4e24-b74d-37d5618f5223}" symbol="4" label="Trail" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = 'Trail'"/>
           </rule>
-          <rule label="Show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" description="Only show when active in Atlas" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule checkstate="0" label="21KM" filter="&quot;Source&quot; = '21KM'" symbol="6" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule checkstate="0" label="10KM" filter="&quot;Source&quot; = '10KM'" symbol="7" description="This should be disabled, since it's only for legends" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule checkstate="0" label="5KM" filter="&quot;Source&quot; = '5KM'" symbol="8" description="This should be disabled, since it's only for legends" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule checkstate="0" label="Trail" filter="&quot;Source&quot; = 'Trail'" symbol="9" description="This should be disabled, since it's only for legends" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="5" label="Show by day" 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)' ) )">
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="6" label="21KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '21KM'"/>
+            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="7" label="10KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '10KM'"/>
+            <rule key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="8" label="5KM" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = '5KM'"/>
+            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="9" label="Trail" description="This should be disabled, since it's only for legends" checkstate="0" filter="&quot;Source&quot; = 'Trail'"/>
           </rule>
-          <rule checkstate="0" label="Always show" symbol="10" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule checkstate="0" label="Always show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="11" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="10" label="Always show" checkstate="0"/>
+          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="11" label="Always show by day" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1450,44 +1451,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -1503,32 +1504,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@0@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@0@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -1543,15 +1544,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1559,35 +1560,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -1618,36 +1619,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1667,40 +1668,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1723,38 +1724,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1774,40 +1775,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -1830,47 +1831,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -1890,44 +1891,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -1943,32 +1944,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -1983,15 +1984,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1999,35 +2000,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2058,36 +2059,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2107,40 +2108,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2163,38 +2164,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2214,40 +2215,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2270,58 +2271,58 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="10" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="10" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2352,56 +2353,56 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="11" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="11" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.46"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.46"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2432,45 +2433,45 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2490,44 +2491,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -2543,32 +2544,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@2@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -2583,15 +2584,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2599,35 +2600,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -2658,36 +2659,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2707,40 +2708,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2763,38 +2764,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2814,40 +2815,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -2870,47 +2871,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="3" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -2930,44 +2931,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@3@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@3@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -2983,32 +2984,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@3@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@3@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="145,211,55,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="145,211,55,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -3023,15 +3024,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3039,35 +3040,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,211,55,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,211,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3098,36 +3099,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3147,40 +3148,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@3@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@3@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3203,38 +3204,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3254,40 +3255,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@3@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@3@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3310,47 +3311,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="4" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="4" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3370,44 +3371,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@4@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@4@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -3423,32 +3424,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@4@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@4@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,72,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,72,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -3463,15 +3464,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3479,35 +3480,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,72,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,72,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3538,36 +3539,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3587,40 +3588,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@4@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@4@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3643,38 +3644,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3694,40 +3695,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@4@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@4@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -3750,47 +3751,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="5" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="5" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -3810,44 +3811,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@5@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@5@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,0,0,255" k="color"/>
@@ -3863,32 +3864,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@5@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@5@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -3903,15 +3904,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3919,35 +3920,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -3978,36 +3979,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4027,40 +4028,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@5@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@5@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4083,38 +4084,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4134,40 +4135,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@5@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@5@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4190,47 +4191,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                          <Option type="int" name="type" value="3"/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                          <Option name="type" type="int" value="3"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="6" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="6" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4250,44 +4251,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@6@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@6@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -4303,32 +4304,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@6@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@6@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -4343,15 +4344,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4359,35 +4360,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4418,36 +4419,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4467,40 +4468,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@6@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@6@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4523,38 +4524,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4574,40 +4575,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@6@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@6@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4630,47 +4631,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="7" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="7" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4690,44 +4691,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@7@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@7@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -4743,32 +4744,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@7@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@7@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -4783,15 +4784,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4799,35 +4800,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -4858,36 +4859,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -4907,40 +4908,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@7@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@7@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -4963,38 +4964,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5014,40 +5015,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@7@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@7@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5070,47 +5071,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="8" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="8" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5130,44 +5131,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@8@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@8@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="145,211,55,255" k="color"/>
@@ -5183,32 +5184,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@8@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@8@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="145,211,55,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="145,211,55,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="145,211,55,255" k="color"/>
@@ -5223,15 +5224,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5239,35 +5240,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,211,55,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,211,55,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5298,36 +5299,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5347,40 +5348,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@8@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@8@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5403,38 +5404,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5454,40 +5455,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@8@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@8@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="145,211,55,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="145,211,55,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5510,47 +5511,47 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="9" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="9" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="250"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="RenderMetersInMapUnits"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="250"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="RenderMetersInMapUnits"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5570,44 +5571,44 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@9@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@9@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="0,72,255,255" k="color"/>
@@ -5623,32 +5624,32 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@9@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@9@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,72,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="227,26,28,0"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,72,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="227,26,28,0"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,72,255,255" k="color"/>
@@ -5663,15 +5664,15 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5679,35 +5680,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,72,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.5"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,72,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.5"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -5738,36 +5739,36 @@
               <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5787,40 +5788,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@9@2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@9@2" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5843,38 +5844,38 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="FirstVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="FirstVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -5894,40 +5895,40 @@
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@9@3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@9@3" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,72,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,72,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -5950,15 +5951,15 @@
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="fillColor">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="fillColor" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5967,47 +5968,47 @@
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
+          <rule key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" active="0" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="round($length / 1000, 0)" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="round($length / 1000, 0)" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="164,113,88,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="164,113,88,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -6030,34 +6031,34 @@
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -6072,98 +6073,98 @@
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="0" geometryGenerator="km_marker()" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="1" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="3" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="km_marker()" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="3" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="1" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -6172,10 +6173,10 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
@@ -6184,56 +6185,56 @@
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -6264,9 +6265,9 @@
                 <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6274,215 +6275,215 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Name" index="0"/>
-        <alias name="" field="descriptio" index="1"/>
-        <alias name="" field="timestamp" index="2"/>
-        <alias name="" field="begin" index="3"/>
-        <alias name="" field="end" index="4"/>
-        <alias name="" field="Distance" index="5"/>
-        <alias name="" field="RouteLen" index="6"/>
-        <alias name="" field="Source" index="7"/>
-        <alias name="" field="Sort" index="8"/>
-        <alias name="" field="day" index="9"/>
-        <alias name="" field="length_km" index="10"/>
-        <alias name="" field="length_m" index="11"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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 field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="Sort" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_m" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Sort" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="Name" desc=""/>
-        <constraint exp="" field="descriptio" desc=""/>
-        <constraint exp="" field="timestamp" desc=""/>
-        <constraint exp="" field="begin" desc=""/>
-        <constraint exp="" field="end" desc=""/>
-        <constraint exp="" field="Distance" desc=""/>
-        <constraint exp="" field="RouteLen" desc=""/>
-        <constraint exp="" field="Source" desc=""/>
-        <constraint exp="" field="Sort" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="length_km" desc=""/>
-        <constraint exp="" field="length_m" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" comment="" expression="$length * 100" name="length_km" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="$length * 100 * 1000" name="length_m" type="6" subType="0" precision="0" typeName="double precision"/>
+        <field comment="" length="-1" expression="$length * 100" name="length_km" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="$length * 100 * 1000" name="length_m" precision="0" type="6" typeName="double precision" subType="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;length_m&quot;" sortOrder="1" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="1" sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="Name" hidden="0" width="152"/>
-          <column type="field" name="descriptio" hidden="0" width="-1"/>
-          <column type="field" name="timestamp" hidden="0" width="-1"/>
-          <column type="field" name="begin" hidden="0" width="163"/>
-          <column type="field" name="end" hidden="0" width="-1"/>
-          <column type="field" name="Distance" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="RouteLen" hidden="0" width="-1"/>
-          <column type="field" name="Source" hidden="0" width="-1"/>
-          <column type="field" name="length_m" hidden="0" width="188"/>
-          <column type="field" name="Sort" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="length_km" hidden="0" width="266"/>
+          <column hidden="0" name="Name" type="field" width="152"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="163"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="188"/>
+          <column hidden="0" name="Sort" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="266"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6514,18 +6515,18 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="0"/>
-        <field name="length_m" editable="0"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="0" name="length_km"/>
+        <field editable="0" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -6542,25 +6543,25 @@ def my_form_open(dialog, layer, feature):
         <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 maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6633,58 +6634,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="196,60,57,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6715,36 +6716,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -6759,44 +6760,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -6819,54 +6820,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="183,72,75,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="183,72,75,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -6897,9 +6898,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6910,36 +6911,36 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -6948,30 +6949,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="ID" index="0"/>
-        <alias name="" field="height" index="1"/>
-        <alias name="" field="elevation" index="2"/>
+        <alias field="ID" index="0" name=""/>
+        <alias field="height" index="1" name=""/>
+        <alias field="elevation" index="2" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="ID"/>
-        <default expression="" applyOnUpdate="0" field="height"/>
-        <default expression="" applyOnUpdate="0" field="elevation"/>
+        <default field="ID" expression="" applyOnUpdate="0"/>
+        <default field="height" expression="" applyOnUpdate="0"/>
+        <default field="elevation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="ID" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="height" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="elevation" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="ID" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="height" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="elevation" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="ID" desc=""/>
-        <constraint exp="" field="height" desc=""/>
-        <constraint exp="" field="elevation" desc=""/>
+        <constraint field="ID" desc="" exp=""/>
+        <constraint field="height" desc="" exp=""/>
+        <constraint field="elevation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6994,7 +6995,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Polygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7069,58 +7070,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="133,182,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="133,182,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7151,36 +7152,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -7195,44 +7196,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7255,38 +7256,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -7301,9 +7302,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7314,45 +7315,45 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -7361,34 +7362,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
-        <alias name="" field="page" index="2"/>
-        <alias name="" field="day" index="3"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="page" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="page" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="page" desc=""/>
-        <constraint exp="" field="day" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7411,7 +7412,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Polygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -7486,58 +7487,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="243,166,178,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -7568,36 +7569,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="243,166,178,255" k="color"/>
@@ -7612,44 +7613,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -7672,38 +7673,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="38,162,105,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="f_diagonal"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="38,162,105,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="f_diagonal"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -7718,9 +7719,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="f_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7731,59 +7732,59 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option type="int" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="int" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="5" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="0" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="1" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="0" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="1" minScaleDenominator="0" penColor="#000000" spacing="5" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="0" underline="0" bold="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -7814,9 +7815,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7824,57 +7825,57 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="1" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option type="double" name="allowedGapsBuffer" value="0"/>
-            <Option type="bool" name="allowedGapsEnabled" value="false"/>
-            <Option type="QString" name="allowedGapsLayer" value=""/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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="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="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -7883,45 +7884,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="name" index="0"/>
-        <alias name="" field="group" index="1"/>
-        <alias name="" field="type" index="2"/>
-        <alias name="" field="day" index="3"/>
-        <alias name="" field="cone_len" index="4"/>
+        <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=""/>
       </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"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="group" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="cone_len" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="name" hidden="0" width="306"/>
-          <column type="field" name="group" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="cone_len" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="name" type="field" width="306"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="cone_len" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7953,11 +7954,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="cone_len" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <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"/>
@@ -7967,18 +7968,18 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -8043,7 +8044,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8068,58 +8069,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,178,151,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8150,36 +8151,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -8194,44 +8195,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -8254,54 +8255,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,85,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,85,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8332,9 +8333,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8345,32 +8346,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="Name" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" fieldName="Name" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -8385,116 +8386,116 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="LineGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="LineGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="Name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="Name"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -8525,9 +8526,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8535,30 +8536,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -8567,30 +8568,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="Name" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Name" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Name" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="Name" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Name" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="Name" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8622,8 +8623,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Name" editable="1"/>
-        <field name="id" editable="1"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Name"/>
@@ -8635,7 +8636,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8700,7 +8701,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8725,58 +8726,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,82,45,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -8807,36 +8808,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -8851,44 +8852,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -8911,48 +8912,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule label="21KM" filter="&quot;distance&quot; = '21KM'" symbol="0" description="Only show when active in Atlas" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule label="10KM" filter="&quot;distance&quot; = '10KM'" symbol="1" description="Only show when active in Atlas" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule label="5KM" filter="&quot;distance&quot; = '5KM'" symbol="2" description="Only show when active in Atlas" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM" description="Only show when active in Atlas" filter="&quot;distance&quot; = '21KM'"/>
+          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM" description="Only show when active in Atlas" filter="&quot;distance&quot; = '10KM'"/>
+          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM" description="Only show when active in Atlas" filter="&quot;distance&quot; = '5KM'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -8972,40 +8973,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="miter"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0.5"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="area"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="miter"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="210,32,39,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="area"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -9028,32 +9029,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9073,44 +9074,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@0@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="210,32,39,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="210,32,39,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="210,32,39,255" k="color"/>
@@ -9126,32 +9127,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@0@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@0@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="210,32,39,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="210,32,39,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="210,32,39,255" k="color"/>
@@ -9166,9 +9167,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9176,35 +9177,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="210,32,39,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="210,32,39,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9235,39 +9236,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9287,44 +9288,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -9340,32 +9341,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.5"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -9380,9 +9381,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9390,24 +9391,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9427,44 +9428,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -9480,32 +9481,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -9520,9 +9521,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9530,35 +9531,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9589,39 +9590,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="500"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="500"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9641,44 +9642,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="69,100,25,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9694,32 +9695,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@2@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@2@0@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="69,100,25,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="69,100,25,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.5"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="69,100,25,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.5"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9734,9 +9735,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9744,24 +9745,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="100"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="100"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -9781,44 +9782,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="interval">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="interval" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="offsetAlongLine">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="offsetAlongLine" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="69,100,25,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MapUnit"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="69,100,25,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MapUnit"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="69,100,25,255" k="color"/>
@@ -9834,32 +9835,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@2@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@2@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="69,100,25,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="26,0,201,0"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="69,100,25,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="26,0,201,0"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="69,100,25,255" k="color"/>
@@ -9874,9 +9875,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9884,35 +9885,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MapUnit"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="69,100,25,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MapUnit"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MapUnit"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="69,100,25,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MapUnit"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -9943,74 +9944,74 @@ 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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </symbols>
         <orderby>
-          <orderByClause nullsFirst="0" asc="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
+          <orderByClause asc="0" nullsFirst="0">lpad(regexp_substr("Distance",'([0-9]+)'), 2, '0')</orderByClause>
         </orderby>
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -10041,9 +10042,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10051,65 +10052,65 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="Distance" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Distance" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Distance" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="Distance" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="Distance" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="id" hidden="0" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10141,17 +10142,17 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -10172,7 +10173,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -10245,58 +10246,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="125,139,143,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -10327,36 +10328,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -10371,44 +10372,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -10431,46 +10432,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="marker" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="0.796078">
+          <symbol alpha="0.796078" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="227,0,185,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,0"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="1"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="227,0,185,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,0"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -10493,15 +10494,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10512,34 +10513,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 key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="8" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="8" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.40000000000000002" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0.20000000000000001" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -10554,151 +10555,151 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="8" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="1" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="8" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="4" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="227,0,185,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="227,0,185,255" fontSize="4" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.10000000000000001" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -10713,89 +10714,89 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="2" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="2" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -10804,194 +10805,194 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/angleOffset" value="0"/>
-          <Option type="QString" name="labeling/blendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferColorA" value="255"/>
-          <Option type="QString" name="labeling/bufferColorB" value="255"/>
-          <Option type="QString" name="labeling/bufferColorG" value="255"/>
-          <Option type="QString" name="labeling/bufferColorR" value="255"/>
-          <Option type="QString" name="labeling/bufferDraw" value="false"/>
-          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
-          <Option type="QString" name="labeling/bufferSize" value="1"/>
-          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/bufferTransp" value="0"/>
-          <Option type="QString" name="labeling/centroidInside" value="false"/>
-          <Option type="QString" name="labeling/centroidWhole" value="false"/>
-          <Option type="QString" name="labeling/decimals" value="3"/>
-          <Option type="QString" name="labeling/displayAll" value="false"/>
-          <Option type="QString" name="labeling/dist" value="0"/>
-          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/drawLabels" value="false"/>
-          <Option type="QString" name="labeling/enabled" value="false"/>
-          <Option type="QString" name="labeling/fieldName" value="position"/>
-          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
-          <Option type="QString" name="labeling/fontCapitals" value="0"/>
-          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
-          <Option type="QString" name="labeling/fontItalic" value="false"/>
-          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
-          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
-          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
-          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
-          <Option type="QString" name="labeling/fontSize" value="10"/>
-          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
-          <Option type="QString" name="labeling/fontUnderline" value="false"/>
-          <Option type="QString" name="labeling/fontWeight" value="63"/>
-          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
-          <Option type="QString" name="labeling/formatNumbers" value="false"/>
-          <Option type="QString" name="labeling/isExpression" value="false"/>
-          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
-          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/labelPerPart" value="false"/>
-          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
-          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
-          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
-          <Option type="QString" name="labeling/mergeLines" value="false"/>
-          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
-          <Option type="QString" name="labeling/multilineAlign" value="0"/>
-          <Option type="QString" name="labeling/multilineHeight" value="1"/>
-          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
-          <Option type="QString" name="labeling/obstacle" value="true"/>
-          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
-          <Option type="QString" name="labeling/obstacleType" value="0"/>
-          <Option type="QString" name="labeling/offsetType" value="0"/>
-          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
-          <Option type="QString" name="labeling/placement" value="0"/>
-          <Option type="QString" name="labeling/placementFlags" value="10"/>
-          <Option type="QString" name="labeling/plussign" value="false"/>
-          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option type="QString" name="labeling/preserveRotation" value="true"/>
-          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
-          <Option type="QString" name="labeling/priority" value="5"/>
-          <Option type="QString" name="labeling/quadOffset" value="4"/>
-          <Option type="QString" name="labeling/repeatDistance" value="0"/>
-          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
-          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
-          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
-          <Option type="QString" name="labeling/scaleMin" value="1"/>
-          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
-          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
-          <Option type="QString" name="labeling/shadowColorB" value="0"/>
-          <Option type="QString" name="labeling/shadowColorG" value="0"/>
-          <Option type="QString" name="labeling/shadowColorR" value="0"/>
-          <Option type="QString" name="labeling/shadowDraw" value="false"/>
-          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
-          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
-          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
-          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
-          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
-          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowScale" value="100"/>
-          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
-          <Option type="QString" name="labeling/shadowUnder" value="0"/>
-          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeDraw" value="true"/>
-          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
-          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
-          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
-          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
-          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
-          <Option type="QString" name="labeling/shapeRotation" value="0"/>
-          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
-          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
-          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
-          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
-          <Option type="QString" name="labeling/shapeType" value="0"/>
-          <Option type="QString" name="labeling/textColorA" value="255"/>
-          <Option type="QString" name="labeling/textColorB" value="255"/>
-          <Option type="QString" name="labeling/textColorG" value="255"/>
-          <Option type="QString" name="labeling/textColorR" value="255"/>
-          <Option type="QString" name="labeling/textTransp" value="0"/>
-          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
-          <Option type="QString" name="labeling/wrapChar" value=""/>
-          <Option type="QString" name="labeling/xOffset" value="0"/>
-          <Option type="QString" name="labeling/yOffset" value="0"/>
-          <Option type="QString" name="labeling/zIndex" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -11022,9 +11023,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11032,83 +11033,83 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="10" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="10" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="position" index="1"/>
-        <alias name="" field="type" index="2"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="position" desc=""/>
-        <constraint exp="" field="type" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="position" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11184,7 +11185,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Polygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11249,7 +11250,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11278,58 +11279,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="164,113,88,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -11360,36 +11361,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -11404,44 +11405,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -11464,38 +11465,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,85,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,85,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="b_diagonal"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,85,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,85,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,85,0,255" k="color"/>
@@ -11510,9 +11511,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11523,62 +11524,62 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="&quot;name&quot;"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -11609,9 +11610,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11619,64 +11620,64 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="1" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option type="double" name="allowedGapsBuffer" value="0"/>
-            <Option type="bool" name="allowedGapsEnabled" value="false"/>
-            <Option type="QString" name="allowedGapsLayer" value=""/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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">
+        <field configurationFlags="None" name="day">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="cone_len" configurationFlags="None">
+        <field configurationFlags="None" name="cone_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="fence_len" configurationFlags="None">
+        <field configurationFlags="None" name="fence_len">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -11685,50 +11686,50 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="name" index="0"/>
-        <alias name="" field="group" index="1"/>
-        <alias name="" field="type" index="2"/>
-        <alias name="" field="day" index="3"/>
-        <alias name="" field="cone_len" index="4"/>
-        <alias name="" field="fence_len" index="5"/>
+        <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=""/>
       </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"/>
-        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="group" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="cone_len" desc=""/>
-        <constraint exp="" field="fence_len" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="name" hidden="0" width="415"/>
-          <column type="field" name="group" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="cone_len" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="fence_len" hidden="0" width="-1"/>
+          <column hidden="0" name="name" type="field" width="415"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="cone_len" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="fence_len" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11760,12 +11761,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="cone_len" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="fence_len" editable="1"/>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <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 labelOnTop="0" name="cone_len"/>
@@ -11776,19 +11777,19 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="cone_len" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="fence_len" reuseLastValue="0"/>
-        <field name="group" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="cone_len"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="fence_len"/>
+        <field reuseLastValue="0" name="group"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="type"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11853,7 +11854,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11867,26 +11868,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" type="6" subType="0" precision="0" typeName="double precision"/>
+        <field comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" precision="0" type="6" typeName="double precision" subType="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis labelsEnabled="1" minScale="1e+08" simplifyDrawingTol="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyLocal="1" simplifyAlgorithm="0" version="3.8.3-Zanzibar" readOnly="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingHints="1" maxScale="0">
+          <qgis version="3.8.3-Zanzibar" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" maxScale="0" minScale="1e+08" simplifyDrawingTol="1" labelsEnabled="1" simplifyLocal="1" styleCategories="AllStyleCategories" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
+            <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" type="RuleRenderer">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" label="Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol force_rhr="0" name="0" type="line" clip_to_extent="1" alpha="1">
-                  <layer pass="0" locked="0" class="SimpleLine" enabled="1">
+                <symbol alpha="1" force_rhr="0" clip_to_extent="1" name="0" type="line">
+                  <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -11916,17 +11917,17 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontUnderline="0" textOpacity="0.8" blendMode="0" fontWeight="50" fontFamily="Myriad Pro" fontStrikeout="0" namedStyle="Regular" fontLetterSpacing="0" fontSize="11" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fieldName="comment" useSubstitutions="0" isExpression="0" fontCapitals="0" multilineHeight="1" fontSizeUnit="Point">
-                      <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferNoFill="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                      <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0.6" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="255,255,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeOpacity="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeSizeUnit="MM"/>
-                      <shadow shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                    <text-style namedStyle="Regular" textColor="0,0,0,255" fontSize="11" fieldName="comment" useSubstitutions="0" multilineHeight="1" textOpacity="0.8" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="50">
+                      <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferBlendMode="0" bufferColor="255,255,255,255" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                      <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeSizeY="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeSVGFile="" shapeOpacity="0.6" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeOffsetUnit="MM"/>
+                      <shadow shadowOpacity="0.7" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="4294967295" decimals="3" plussign="0" formatNumbers="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                    <placement rotationAngle="0" quadOffset="4" repeatDistance="0" offsetType="0" priority="5" geometryGenerator="" xOffset="0" maxCurvedCharAngleOut="-25" dist="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" preserveRotation="1" offsetUnits="MM" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="4" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" centroidWhole="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM"/>
-                    <rendering drawLabels="1" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="1" obstacleType="0" displayAll="1" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                    <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="4294967295"/>
+                    <placement priority="5" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" xOffset="0" placement="4" distUnits="MM" repeatDistance="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" geometryGeneratorType="PointGeometry" rotationAngle="0" offsetUnits="MM" centroidInside="0" repeatDistanceUnits="MM" dist="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" placementFlags="2" quadOffset="4" centroidWhole="0" offsetType="0" maxCurvedCharAngleOut="-25"/>
+                    <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="1" displayAll="1" upsidedownLabels="0" obstacle="1" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" type="QString" value=""/>
@@ -11947,17 +11948,17 @@ def my_form_open(dialog, layer, feature):
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontUnderline="0" textOpacity="1" blendMode="0" fontWeight="63" fontFamily="Myriad Pro" fontStrikeout="0" namedStyle="Semibold" fontLetterSpacing="0" fontSize="12" previewBkgrdColor="#ffffff" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fieldName="round( $length, 1) || 'm'" useSubstitutions="0" isExpression="1" fontCapitals="0" multilineHeight="1" fontSizeUnit="Point">
-                      <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferBlendMode="0" bufferNoFill="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                      <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeOffsetY="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOffsetUnit="MM" shapeRotationType="0" shapeSizeUnit="MM"/>
-                      <shadow shadowRadius="1.5" shadowOffsetGlobal="1" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                    <text-style namedStyle="Semibold" textColor="0,0,0,255" fontSize="12" fieldName="round( $length, 1) || 'm'" useSubstitutions="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="#ffffff" fontLetterSpacing="0" fontWeight="63">
+                      <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferBlendMode="0" bufferColor="255,255,255,255" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                      <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeSVGFile="" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM"/>
+                      <shadow shadowOpacity="0.7" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowRadius="1.5" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                       <substitutions/>
                     </text-style>
-                    <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="4294967295" decimals="3" plussign="0" formatNumbers="0" rightDirectionSymbol=">" reverseDirectionSymbol="0" wrapChar="" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                    <placement rotationAngle="0" quadOffset="4" repeatDistance="0" offsetType="0" priority="5" geometryGenerator="" xOffset="0" maxCurvedCharAngleOut="-25" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidInside="0" preserveRotation="1" offsetUnits="MM" fitInPolygonOnly="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" centroidWhole="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" geometryGeneratorEnabled="0" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM"/>
-                    <rendering drawLabels="1" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" displayAll="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                    <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="4294967295"/>
+                    <placement priority="5" geometryGenerator="" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" xOffset="0" placement="2" distUnits="MM" repeatDistance="0" fitInPolygonOnly="0" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" geometryGeneratorType="PointGeometry" rotationAngle="0" offsetUnits="MM" centroidInside="0" repeatDistanceUnits="MM" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" placementFlags="15" quadOffset="4" centroidWhole="0" offsetType="0" maxCurvedCharAngleOut="-25"/>
+                    <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" displayAll="0" upsidedownLabels="0" obstacle="1" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" type="QString" value=""/>
@@ -11981,8 +11982,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -11990,12 +11991,12 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" enabled="0" penAlpha="255" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" barWidth="5" minimumSize="0" backgroundAlpha="255" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" rotationOffset="270" minScaleDenominator="0" penColor="#000000" scaleDependency="Area" maxScaleDenominator="1e+08" opacity="1">
+              <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" lineSizeType="MM" penWidth="0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" minScaleDenominator="0" penColor="#000000" diagramOrientation="Up" penAlpha="255" backgroundAlpha="255" barWidth="5">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" field="" color="#000000"/>
+                <attribute color="#000000" field="" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" dist="0" placement="2">
+            <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
               <properties>
                 <Option type="Map">
                   <Option name="name" type="QString" value=""/>
@@ -12004,7 +12005,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -12088,81 +12089,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias name="" field="id" index="0"/>
-              <alias name="" field="group" index="1"/>
-              <alias name="" field="comment" index="2"/>
-              <alias name="" field="moveable" index="3"/>
-              <alias name="" field="type" index="4"/>
-              <alias name="" field="name" index="5"/>
-              <alias name="" field="hidden" index="6"/>
-              <alias name="" field="auxiliary_storage_labeling_positiony" index="7"/>
-              <alias name="" field="auxiliary_storage_labeling_positionx" index="8"/>
-              <alias name="" field="fence_len" index="9"/>
-              <alias name="" field="cone_len" index="10"/>
+              <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=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <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"/>
+              <default field="id" expression="" applyOnUpdate="0"/>
+              <default field="group" expression="" applyOnUpdate="0"/>
+              <default field="comment" expression="" applyOnUpdate="0"/>
+              <default field="moveable" expression="" applyOnUpdate="0"/>
+              <default field="type" expression="" applyOnUpdate="0"/>
+              <default field="name" expression="" applyOnUpdate="0"/>
+              <default field="hidden" expression="" applyOnUpdate="0"/>
+              <default field="auxiliary_storage_labeling_positiony" expression="" applyOnUpdate="0"/>
+              <default field="auxiliary_storage_labeling_positionx" expression="" applyOnUpdate="0"/>
+              <default field="fence_len" expression="" applyOnUpdate="0"/>
+              <default field="cone_len" expression="" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="comment" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="moveable" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="hidden" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
-              <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+              <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="comment" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="moveable" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="hidden" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint exp="" field="id" desc=""/>
-              <constraint exp="" field="group" desc=""/>
-              <constraint exp="" field="comment" desc=""/>
-              <constraint exp="" field="moveable" desc=""/>
-              <constraint exp="" field="type" desc=""/>
-              <constraint exp="" field="name" desc=""/>
-              <constraint exp="" field="hidden" desc=""/>
-              <constraint exp="" field="auxiliary_storage_labeling_positiony" desc=""/>
-              <constraint exp="" field="auxiliary_storage_labeling_positionx" desc=""/>
-              <constraint exp="" field="fence_len" desc=""/>
-              <constraint exp="" field="cone_len" desc=""/>
+              <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=""/>
             </constraintExpressions>
             <expressionfields>
-              <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-              <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-              <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" name="cone_len" type="6" subType="0" precision="0" typeName="double precision"/>
+              <field comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" name="fence_len" type="6" typeName="double precision" subType="0"/>
+              <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" name="fence_len" type="6" typeName="double precision" subType="0"/>
+              <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" name="cone_len" type="6" typeName="double precision" subType="0"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
-            <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
               <columns>
-                <column name="id" type="field" hidden="0" width="-1"/>
-                <column name="group" type="field" hidden="0" width="-1"/>
-                <column type="actions" hidden="1" width="-1"/>
-                <column name="comment" type="field" hidden="0" width="223"/>
-                <column name="moveable" type="field" hidden="0" width="-1"/>
-                <column name="type" type="field" hidden="0" width="-1"/>
-                <column name="name" type="field" hidden="0" width="414"/>
-                <column name="hidden" type="field" hidden="0" width="-1"/>
-                <column name="fence_len" type="field" hidden="0" width="-1"/>
-                <column name="cone_len" type="field" hidden="0" width="-1"/>
-                <column name="auxiliary_storage_labeling_positiony" type="field" hidden="1" width="-1"/>
-                <column name="auxiliary_storage_labeling_positionx" type="field" hidden="1" width="-1"/>
+                <column hidden="0" name="id" width="-1" type="field"/>
+                <column hidden="0" name="group" width="-1" type="field"/>
+                <column hidden="1" width="-1" type="actions"/>
+                <column hidden="0" name="comment" width="223" type="field"/>
+                <column hidden="0" name="moveable" width="-1" type="field"/>
+                <column hidden="0" name="type" width="-1" type="field"/>
+                <column hidden="0" name="name" width="414" type="field"/>
+                <column hidden="0" name="hidden" width="-1" type="field"/>
+                <column hidden="0" name="fence_len" width="-1" type="field"/>
+                <column hidden="0" name="cone_len" width="-1" type="field"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positiony" width="-1" type="field"/>
+                <column hidden="1" name="auxiliary_storage_labeling_positionx" width="-1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -12193,18 +12194,18 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-              <field name="comment" editable="1"/>
-              <field name="cone_len" editable="0"/>
-              <field name="fence_len" editable="0"/>
-              <field name="group" editable="1"/>
-              <field name="hidden" editable="1"/>
-              <field name="id" editable="1"/>
-              <field name="length" editable="0"/>
-              <field name="moveable" editable="1"/>
-              <field name="name" editable="1"/>
-              <field name="type" editable="1"/>
+              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+              <field editable="1" name="comment"/>
+              <field editable="0" name="cone_len"/>
+              <field editable="0" name="fence_len"/>
+              <field editable="1" name="group"/>
+              <field editable="1" name="hidden"/>
+              <field editable="1" name="id"/>
+              <field editable="0" name="length"/>
+              <field editable="1" name="moveable"/>
+              <field editable="1" name="name"/>
+              <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
               <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -12235,58 +12236,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="133,182,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="133,182,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12317,36 +12318,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="133,182,111,255" k="color"/>
@@ -12361,44 +12362,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="133,182,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="95,130,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="133,182,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="95,130,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -12421,64 +12422,64 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="1" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="1" type="RuleRenderer">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule label="Cones" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule label="Moveable fences" 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" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule label="Fixed fences" 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" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule label="Construction" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
+            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" label="Cones" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" label="Construction" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
           </rule>
-          <rule checkstate="0" label="Is Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="4" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
+          <rule key="{7917c389-04f8-48d5-ab53-8783abd3803e}" symbol="4" label="Is Visible" checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="round"/>
-                <Option type="QString" name="customdash" value="1;4"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="Point"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="dot"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="1;4"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="Point"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dot"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -12509,56 +12510,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="round"/>
-                <Option type="QString" name="customdash" value="4;3"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="round"/>
+                <Option name="customdash" type="QString" value="4;3"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="round" k="capstyle"/>
@@ -12589,56 +12590,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.8"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12669,56 +12670,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="3" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,0,255,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.8"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,0,255,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.8"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12749,56 +12750,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="4" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="4" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12829,50 +12830,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="5" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="5" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="213,180,60,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -12903,9 +12904,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12914,34 +12915,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{23c89a1d-a8e0-4ceb-943a-dc351cead91c}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}">
+          <rule key="{f5ce1268-4b21-43aa-bb4a-36a72344effb}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.80000000000000004" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="11" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="comment" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="11" capitalization="0" fieldName="comment" multilineHeight="1" useSubstitutions="0" textOpacity="0.80000000000000004" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0.59999999999999998" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="255,255,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeBlendMode="0" shapeSizeY="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="0.59999999999999998" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="255,255,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.6"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="255,255,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.6"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -12956,118 +12957,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                        <Option type="int" name="type" value="2"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="4294967295" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="14" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="5" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8200000000000001" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="1" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="4294967295"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="5" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="1" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1.8200000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" description="Fence lengths" key="{34f3e470-d39d-4987-b6a1-0a45c5615495}">
+          <rule key="{34f3e470-d39d-4987-b6a1-0a45c5615495}" description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="11" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="11" capitalization="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="196,60,57,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -13090,34 +13091,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -13132,112 +13133,112 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="6" placementFlags="14" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="6" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="1"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" description="Cones lengths" key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}">
+          <rule key="{b02653d7-b9e7-40af-8f7e-1a4c01667663}" description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="11" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="11" capitalization="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="196,60,57,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -13260,34 +13261,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -13302,112 +13303,112 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="6" placementFlags="14" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="6" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="1"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{359df8b8-e018-47fc-a639-e6e8d7640da2}">
+          <rule key="{359df8b8-e018-47fc-a639-e6e8d7640da2}" active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="11" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="11" capitalization="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="196,60,57,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -13430,34 +13431,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -13472,72 +13473,72 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="6" placementFlags="14" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="6" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="1"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="1"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positionx"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positionx"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="auxiliary_storage_labeling_positiony"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="auxiliary_storage_labeling_positiony"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -13546,62 +13547,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="&quot;id&quot;"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -13632,9 +13633,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13642,86 +13643,86 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -13730,74 +13731,74 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="group" index="1"/>
-        <alias name="" field="comment" index="2"/>
-        <alias name="" field="moveable" index="3"/>
-        <alias name="" field="type" index="4"/>
-        <alias name="" field="name" index="5"/>
-        <alias name="" field="hidden" index="6"/>
-        <alias name="" field="day" index="7"/>
-        <alias name="" field="fence_len" index="8"/>
-        <alias name="" field="cone_len" index="9"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="group" expression="" applyOnUpdate="0"/>
+        <default field="comment" expression="" applyOnUpdate="0"/>
+        <default field="moveable" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="hidden" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="fence_len" expression="" applyOnUpdate="0"/>
+        <default field="cone_len" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="group" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="comment" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="moveable" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="hidden" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="fence_len" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="cone_len" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="comment" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="moveable" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="hidden" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="group" desc=""/>
-        <constraint exp="" field="comment" desc=""/>
-        <constraint exp="" field="moveable" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="hidden" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="fence_len" desc=""/>
-        <constraint exp="" field="cone_len" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields>
-        <field length="-1" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" type="6" subType="0" precision="0" typeName="double precision"/>
-        <field length="-1" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" type="6" subType="0" precision="0" typeName="double precision"/>
+        <field comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" name="fence_len" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" name="fence_len" precision="0" type="6" typeName="double precision" subType="0"/>
+        <field comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" name="cone_len" precision="0" type="6" typeName="double precision" subType="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="group" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="comment" hidden="0" width="373"/>
-          <column type="field" name="moveable" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="name" hidden="0" width="316"/>
-          <column type="field" name="hidden" hidden="0" width="-1"/>
-          <column type="field" name="fence_len" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="cone_len" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="group" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="comment" type="field" width="373"/>
+          <column hidden="0" name="moveable" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="316"/>
+          <column hidden="0" name="hidden" type="field" width="-1"/>
+          <column hidden="0" name="fence_len" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="cone_len" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13829,19 +13830,19 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="comment" editable="1"/>
-        <field name="cone_len" editable="0"/>
-        <field name="day" editable="1"/>
-        <field name="fence_len" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="hidden" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length" editable="0"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="comment"/>
+        <field editable="0" name="cone_len"/>
+        <field editable="1" name="day"/>
+        <field editable="0" name="fence_len"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="hidden"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="length"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
@@ -13859,23 +13860,23 @@ def my_form_open(dialog, layer, feature):
         <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 maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13948,58 +13949,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="164,113,88,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="164,113,88,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14030,36 +14031,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="164,113,88,255" k="color"/>
@@ -14074,44 +14075,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="164,113,88,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="117,81,63,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="164,113,88,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="117,81,63,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14134,54 +14135,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,178,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,178,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14212,9 +14213,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14225,60 +14226,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -14309,9 +14310,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14319,23 +14320,23 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="id" configurationFlags="None">
+        <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -14344,25 +14345,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
+        <alias field="id" index="0" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
+        <constraint field="id" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14394,7 +14395,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -14405,7 +14406,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="MultiPolygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -14478,58 +14479,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="213,180,60,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="213,180,60,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -14560,36 +14561,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="213,180,60,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="152,129,43,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="213,180,60,255" k="color"/>
@@ -14604,44 +14605,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="213,180,60,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="152,129,43,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="213,180,60,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="152,129,43,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -14664,38 +14665,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="26,0,201,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="dot"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="b_diagonal"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="26,0,201,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="dot"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="b_diagonal"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="26,0,201,255" k="color"/>
@@ -14710,9 +14711,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="b_diagonal" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14723,10 +14724,10 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
@@ -14738,56 +14739,56 @@ def my_form_open(dialog, layer, feature):
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -14818,9 +14819,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14828,59 +14829,59 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
-            <Option type="Map" name="properties">
-              <Option type="Map" name="show">
-                <Option type="bool" name="active" value="true"/>
-                <Option type="QString" name="field" value="id"/>
-                <Option type="int" name="type" value="2"/>
+            <Option name="name" type="QString" value=""/>
+            <Option name="properties" type="Map">
+              <Option name="show" type="Map">
+                <Option name="active" type="bool" value="true"/>
+                <Option name="field" type="QString" value="id"/>
+                <Option name="type" type="int" value="2"/>
               </Option>
             </Option>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="page" configurationFlags="None">
+        <field configurationFlags="None" name="page">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="day" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
@@ -14889,40 +14890,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
-        <alias name="" field="page" index="2"/>
-        <alias name="" field="day" index="3"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="page" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="page" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="page" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="page" desc=""/>
-        <constraint exp="" field="day" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;page&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="page" hidden="0" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="page" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14954,9 +14955,9 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="page" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="page"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -14969,7 +14970,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -15034,7 +15035,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15045,13 +15046,14 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join joinLayerId="marshals_by_position20161003112326575" memoryCache="0" cascadedDelete="0" hasCustomPrefix="1" customPrefix="csv_" upsertOnEdit="0" dynamicForm="0" joinFieldName="position" targetFieldName="position" editable="0">
+        <join editable="0" upsertOnEdit="0" cascadedDelete="0" hasCustomPrefix="1" memoryCache="1" customPrefix="csv_" targetFieldName="position" dynamicForm="0" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position">
           <joinFieldsSubset>
+            <field name="day"/>
             <field name="position"/>
             <field name="club"/>
-            <field name="firstname"/>
-            <field name="surname"/>
-            <field name="days"/>
+            <field name="captain"/>
+            <field name="captain_phone"/>
+            <field name="race"/>
             <field name="first_runner"/>
             <field name="last_runner"/>
             <field name="instructions"/>
@@ -15072,58 +15074,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="id" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="id" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="114,155,111,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="114,155,111,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -15154,36 +15156,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="81,111,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -15198,44 +15200,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="81,111,79,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="81,111,79,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -15258,51 +15260,51 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule label="Show by day in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" description="Show in marshal overview" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule checkstate="0" label="Always show in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule checkstate="0" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0" label="Show by day in marshal plan" description="Show in marshal overview" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1" label="Always show in marshal plan" checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
+          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2" label="Show in marshal maps" checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="0.8">
+          <symbol alpha="0.8" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="Pixel"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -15325,42 +15327,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="0.8">
+          <symbol alpha="0.8" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="Pixel"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="Pixel"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -15383,42 +15385,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="0.01">
+          <symbol alpha="0.01" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="1">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="0.1"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.1"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -15441,9 +15443,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -15451,43 +15453,43 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </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}">
+        <rules key="{e2cfe0de-49d9-4c26-9f28-7c441fcd9406}">
+          <rule key="{6554fdac-c88c-4a54-906c-4410d068210b}" 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; )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="6" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="6" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.10000000000000001" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="231,113,72,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -15510,34 +15512,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15552,118 +15554,118 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="2" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="2" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0" key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}">
+          <rule key="{a4dd1032-0030-4a6b-9402-5837f38a97d7}" active="0" 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')">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="6" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="6" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.10000000000000001" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="231,113,72,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="231,113,72,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -15686,34 +15688,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15728,110 +15730,110 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="2" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="1" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="2" fontLimitPixelSize="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}">
+          <rule key="{9c1b3f4f-60f7-4728-a973-105f4a2bf2a9}" active="0" 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' )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.5" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="6" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="6" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.5" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.40000000000000002" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0.20000000000000001" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.5" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -15846,189 +15848,189 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="AlwaysShow">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                        <Option type="int" name="type" value="3"/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="AlwaysShow" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="FontOpacity">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="FontOpacity" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="FontStyle">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="FontStyle" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ObstacleFactor">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="ObstacleFactor" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="Priority">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Priority" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ShapeOpacity">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="ShapeOpacity" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="Size">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="Size" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
-                      <Option type="Map" name="ZIndex">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                        <Option type="int" name="type" value="3"/>
+                      <Option name="ZIndex" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                        <Option name="type" type="int" value="3"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="8" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" zIndex="5" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="1"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="8" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="5" fontLimitPixelSize="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 1, 0)"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 1, 0)"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlas_featureid = $id, 8, 6 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlas_featureid = $id, 8, 6 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" 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 key="{0a116ab9-23e3-44ab-a89c-47d8c9d3bbc7}" 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; )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.59999999999999998" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="6" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="6" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.59999999999999998" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.40000000000000002" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0.20000000000000001" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.59999999999999998" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -16051,34 +16053,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,255" k="color"/>
@@ -16093,148 +16095,148 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="8" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" zIndex="5" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="1"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="8" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="5" fontLimitPixelSize="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" 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 key="{5fea8fd6-270f-470f-9388-15325712ca1d}" 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">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="8" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="position" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="8" capitalization="0" fieldName="position" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="3" shapeSizeType="0" shapeBorderWidth="0.40000000000000002" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,0,255" shapeOpacity="0.90000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.20000000000000001" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,0,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0.20000000000000001" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="3" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="0.90000000000000002" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="133,182,111,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="133,182,111,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -16257,34 +16259,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,0,255"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.4"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,0,255"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.4"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,0,255" k="color"/>
@@ -16299,108 +16301,108 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="false"/>
-                              <Option type="int" name="type" value="1"/>
-                              <Option type="QString" name="val" value=""/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="false"/>
+                              <Option name="type" type="int" value="1"/>
+                              <Option name="val" type="QString" value=""/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="0" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" zIndex="10" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="0" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="1"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="0" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="10" fontLimitPixelSize="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="AlwaysShow">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="AlwaysShow" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="FontStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="FontStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ObstacleFactor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ObstacleFactor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Priority">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Priority" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ShapeOpacity">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ShapeOpacity" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="Size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="Size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="ZIndex">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="ZIndex" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -16409,206 +16411,197 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
-            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="QString" name="labeling/addDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/angleOffset" value="0"/>
-          <Option type="QString" name="labeling/blendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferBlendMode" value="0"/>
-          <Option type="QString" name="labeling/bufferColorA" value="255"/>
-          <Option type="QString" name="labeling/bufferColorB" value="255"/>
-          <Option type="QString" name="labeling/bufferColorG" value="255"/>
-          <Option type="QString" name="labeling/bufferColorR" value="255"/>
-          <Option type="QString" name="labeling/bufferDraw" value="false"/>
-          <Option type="QString" name="labeling/bufferJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/bufferNoFill" value="false"/>
-          <Option type="QString" name="labeling/bufferSize" value="1"/>
-          <Option type="QString" name="labeling/bufferSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/bufferSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/bufferTransp" value="0"/>
-          <Option type="QString" name="labeling/centroidInside" value="false"/>
-          <Option type="QString" name="labeling/centroidWhole" value="false"/>
-          <Option type="QString" name="labeling/decimals" value="3"/>
-          <Option type="QString" name="labeling/displayAll" value="false"/>
-          <Option type="QString" name="labeling/dist" value="0"/>
-          <Option type="QString" name="labeling/distInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/distMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/drawLabels" value="false"/>
-          <Option type="QString" name="labeling/enabled" value="false"/>
-          <Option type="QString" name="labeling/fieldName" value="position"/>
-          <Option type="QString" name="labeling/fitInPolygonOnly" value="false"/>
-          <Option type="QString" name="labeling/fontCapitals" value="0"/>
-          <Option type="QString" name="labeling/fontFamily" value="Myriad Pro"/>
-          <Option type="QString" name="labeling/fontItalic" value="false"/>
-          <Option type="QString" name="labeling/fontLetterSpacing" value="0"/>
-          <Option type="QString" name="labeling/fontLimitPixelSize" value="false"/>
-          <Option type="QString" name="labeling/fontMaxPixelSize" value="10000"/>
-          <Option type="QString" name="labeling/fontMinPixelSize" value="3"/>
-          <Option type="QString" name="labeling/fontSize" value="10"/>
-          <Option type="QString" name="labeling/fontSizeInMapUnits" value="false"/>
-          <Option type="QString" name="labeling/fontSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/fontStrikeout" value="false"/>
-          <Option type="QString" name="labeling/fontUnderline" value="false"/>
-          <Option type="QString" name="labeling/fontWeight" value="63"/>
-          <Option type="QString" name="labeling/fontWordSpacing" value="0"/>
-          <Option type="QString" name="labeling/formatNumbers" value="false"/>
-          <Option type="QString" name="labeling/isExpression" value="false"/>
-          <Option type="QString" name="labeling/labelOffsetInMapUnits" value="true"/>
-          <Option type="QString" name="labeling/labelOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/labelPerPart" value="false"/>
-          <Option type="QString" name="labeling/leftDirectionSymbol" value="&lt;"/>
-          <Option type="QString" name="labeling/limitNumLabels" value="false"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleIn" value="20"/>
-          <Option type="QString" name="labeling/maxCurvedCharAngleOut" value="-20"/>
-          <Option type="QString" name="labeling/maxNumLabels" value="2000"/>
-          <Option type="QString" name="labeling/mergeLines" value="false"/>
-          <Option type="QString" name="labeling/minFeatureSize" value="0"/>
-          <Option type="QString" name="labeling/multilineAlign" value="0"/>
-          <Option type="QString" name="labeling/multilineHeight" value="1"/>
-          <Option type="QString" name="labeling/namedStyle" value="Semibold"/>
-          <Option type="QString" name="labeling/obstacle" value="true"/>
-          <Option type="QString" name="labeling/obstacleFactor" value="1"/>
-          <Option type="QString" name="labeling/obstacleType" value="0"/>
-          <Option type="QString" name="labeling/offsetType" value="0"/>
-          <Option type="QString" name="labeling/placeDirectionSymbol" value="0"/>
-          <Option type="QString" name="labeling/placement" value="0"/>
-          <Option type="QString" name="labeling/placementFlags" value="10"/>
-          <Option type="QString" name="labeling/plussign" value="false"/>
-          <Option type="QString" name="labeling/predefinedPositionOrder" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
-          <Option type="QString" name="labeling/preserveRotation" value="true"/>
-          <Option type="QString" name="labeling/previewBkgrdColor" value="#ffffff"/>
-          <Option type="QString" name="labeling/priority" value="5"/>
-          <Option type="QString" name="labeling/quadOffset" value="4"/>
-          <Option type="QString" name="labeling/repeatDistance" value="0"/>
-          <Option type="QString" name="labeling/repeatDistanceMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/repeatDistanceUnit" value="1"/>
-          <Option type="QString" name="labeling/reverseDirectionSymbol" value="false"/>
-          <Option type="QString" name="labeling/rightDirectionSymbol" value=">"/>
-          <Option type="QString" name="labeling/scaleMax" value="10000000"/>
-          <Option type="QString" name="labeling/scaleMin" value="1"/>
-          <Option type="QString" name="labeling/scaleVisibility" value="false"/>
-          <Option type="QString" name="labeling/shadowBlendMode" value="6"/>
-          <Option type="QString" name="labeling/shadowColorB" value="0"/>
-          <Option type="QString" name="labeling/shadowColorG" value="0"/>
-          <Option type="QString" name="labeling/shadowColorR" value="0"/>
-          <Option type="QString" name="labeling/shadowDraw" value="false"/>
-          <Option type="QString" name="labeling/shadowOffsetAngle" value="135"/>
-          <Option type="QString" name="labeling/shadowOffsetDist" value="1"/>
-          <Option type="QString" name="labeling/shadowOffsetGlobal" value="true"/>
-          <Option type="QString" name="labeling/shadowOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowRadius" value="1.5"/>
-          <Option type="QString" name="labeling/shadowRadiusAlphaOnly" value="false"/>
-          <Option type="QString" name="labeling/shadowRadiusMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shadowRadiusUnits" value="1"/>
-          <Option type="QString" name="labeling/shadowScale" value="100"/>
-          <Option type="QString" name="labeling/shadowTransparency" value="30"/>
-          <Option type="QString" name="labeling/shadowUnder" value="0"/>
-          <Option type="QString" name="labeling/shapeBlendMode" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeBorderColorB" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorG" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderColorR" value="128"/>
-          <Option type="QString" name="labeling/shapeBorderWidth" value="0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeBorderWidthUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeDraw" value="true"/>
-          <Option type="QString" name="labeling/shapeFillColorA" value="255"/>
-          <Option type="QString" name="labeling/shapeFillColorB" value="138"/>
-          <Option type="QString" name="labeling/shapeFillColorG" value="0"/>
-          <Option type="QString" name="labeling/shapeFillColorR" value="101"/>
-          <Option type="QString" name="labeling/shapeJoinStyle" value="64"/>
-          <Option type="QString" name="labeling/shapeOffsetMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeOffsetUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeOffsetX" value="0"/>
-          <Option type="QString" name="labeling/shapeOffsetY" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeRadiiUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeRadiiX" value="0"/>
-          <Option type="QString" name="labeling/shapeRadiiY" value="0"/>
-          <Option type="QString" name="labeling/shapeRotation" value="0"/>
-          <Option type="QString" name="labeling/shapeRotationType" value="0"/>
-          <Option type="QString" name="labeling/shapeSVGFile" value=""/>
-          <Option type="QString" name="labeling/shapeSizeMapUnitScale" value="0,0,0,0,0,0"/>
-          <Option type="QString" name="labeling/shapeSizeType" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeUnits" value="1"/>
-          <Option type="QString" name="labeling/shapeSizeX" value="0"/>
-          <Option type="QString" name="labeling/shapeSizeY" value="0"/>
-          <Option type="QString" name="labeling/shapeTransparency" value="0"/>
-          <Option type="QString" name="labeling/shapeType" value="0"/>
-          <Option type="QString" name="labeling/textColorA" value="255"/>
-          <Option type="QString" name="labeling/textColorB" value="255"/>
-          <Option type="QString" name="labeling/textColorG" value="255"/>
-          <Option type="QString" name="labeling/textColorR" value="255"/>
-          <Option type="QString" name="labeling/textTransp" value="0"/>
-          <Option type="QString" name="labeling/upsidedownLabels" value="0"/>
-          <Option type="QString" name="labeling/wrapChar" value=""/>
-          <Option type="QString" name="labeling/xOffset" value="0"/>
-          <Option type="QString" name="labeling/yOffset" value="0"/>
-          <Option type="QString" name="labeling/zIndex" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="labeling/addDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/angleOffset" type="QString" value="0"/>
+          <Option name="labeling/blendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferBlendMode" type="QString" value="0"/>
+          <Option name="labeling/bufferColorA" type="QString" value="255"/>
+          <Option name="labeling/bufferColorB" type="QString" value="255"/>
+          <Option name="labeling/bufferColorG" type="QString" value="255"/>
+          <Option name="labeling/bufferColorR" type="QString" value="255"/>
+          <Option name="labeling/bufferDraw" type="QString" value="false"/>
+          <Option name="labeling/bufferJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/bufferNoFill" type="QString" value="false"/>
+          <Option name="labeling/bufferSize" type="QString" value="1"/>
+          <Option name="labeling/bufferSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/bufferSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/bufferTransp" type="QString" value="0"/>
+          <Option name="labeling/centroidInside" type="QString" value="false"/>
+          <Option name="labeling/centroidWhole" type="QString" value="false"/>
+          <Option name="labeling/decimals" type="QString" value="3"/>
+          <Option name="labeling/displayAll" type="QString" value="false"/>
+          <Option name="labeling/dist" type="QString" value="0"/>
+          <Option name="labeling/distInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/distMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/drawLabels" type="QString" value="false"/>
+          <Option name="labeling/enabled" type="QString" value="false"/>
+          <Option name="labeling/fieldName" type="QString" value="position"/>
+          <Option name="labeling/fitInPolygonOnly" type="QString" value="false"/>
+          <Option name="labeling/fontCapitals" type="QString" value="0"/>
+          <Option name="labeling/fontFamily" type="QString" value="Myriad Pro"/>
+          <Option name="labeling/fontItalic" type="QString" value="false"/>
+          <Option name="labeling/fontLetterSpacing" type="QString" value="0"/>
+          <Option name="labeling/fontLimitPixelSize" type="QString" value="false"/>
+          <Option name="labeling/fontMaxPixelSize" type="QString" value="10000"/>
+          <Option name="labeling/fontMinPixelSize" type="QString" value="3"/>
+          <Option name="labeling/fontSize" type="QString" value="10"/>
+          <Option name="labeling/fontSizeInMapUnits" type="QString" value="false"/>
+          <Option name="labeling/fontSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/fontStrikeout" type="QString" value="false"/>
+          <Option name="labeling/fontUnderline" type="QString" value="false"/>
+          <Option name="labeling/fontWeight" type="QString" value="63"/>
+          <Option name="labeling/fontWordSpacing" type="QString" value="0"/>
+          <Option name="labeling/formatNumbers" type="QString" value="false"/>
+          <Option name="labeling/isExpression" type="QString" value="false"/>
+          <Option name="labeling/labelOffsetInMapUnits" type="QString" value="true"/>
+          <Option name="labeling/labelOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/labelPerPart" type="QString" value="false"/>
+          <Option name="labeling/leftDirectionSymbol" type="QString" value="&lt;"/>
+          <Option name="labeling/limitNumLabels" type="QString" value="false"/>
+          <Option name="labeling/maxCurvedCharAngleIn" type="QString" value="20"/>
+          <Option name="labeling/maxCurvedCharAngleOut" type="QString" value="-20"/>
+          <Option name="labeling/maxNumLabels" type="QString" value="2000"/>
+          <Option name="labeling/mergeLines" type="QString" value="false"/>
+          <Option name="labeling/minFeatureSize" type="QString" value="0"/>
+          <Option name="labeling/multilineAlign" type="QString" value="0"/>
+          <Option name="labeling/multilineHeight" type="QString" value="1"/>
+          <Option name="labeling/namedStyle" type="QString" value="Semibold"/>
+          <Option name="labeling/obstacle" type="QString" value="true"/>
+          <Option name="labeling/obstacleFactor" type="QString" value="1"/>
+          <Option name="labeling/obstacleType" type="QString" value="0"/>
+          <Option name="labeling/offsetType" type="QString" value="0"/>
+          <Option name="labeling/placeDirectionSymbol" type="QString" value="0"/>
+          <Option name="labeling/placement" type="QString" value="0"/>
+          <Option name="labeling/placementFlags" type="QString" value="10"/>
+          <Option name="labeling/plussign" type="QString" value="false"/>
+          <Option name="labeling/predefinedPositionOrder" type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <Option name="labeling/preserveRotation" type="QString" value="true"/>
+          <Option name="labeling/previewBkgrdColor" type="QString" value="#ffffff"/>
+          <Option name="labeling/priority" type="QString" value="5"/>
+          <Option name="labeling/quadOffset" type="QString" value="4"/>
+          <Option name="labeling/repeatDistance" type="QString" value="0"/>
+          <Option name="labeling/repeatDistanceMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/repeatDistanceUnit" type="QString" value="1"/>
+          <Option name="labeling/reverseDirectionSymbol" type="QString" value="false"/>
+          <Option name="labeling/rightDirectionSymbol" type="QString" value=">"/>
+          <Option name="labeling/scaleMax" type="QString" value="10000000"/>
+          <Option name="labeling/scaleMin" type="QString" value="1"/>
+          <Option name="labeling/scaleVisibility" type="QString" value="false"/>
+          <Option name="labeling/shadowBlendMode" type="QString" value="6"/>
+          <Option name="labeling/shadowColorB" type="QString" value="0"/>
+          <Option name="labeling/shadowColorG" type="QString" value="0"/>
+          <Option name="labeling/shadowColorR" type="QString" value="0"/>
+          <Option name="labeling/shadowDraw" type="QString" value="false"/>
+          <Option name="labeling/shadowOffsetAngle" type="QString" value="135"/>
+          <Option name="labeling/shadowOffsetDist" type="QString" value="1"/>
+          <Option name="labeling/shadowOffsetGlobal" type="QString" value="true"/>
+          <Option name="labeling/shadowOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowRadius" type="QString" value="1.5"/>
+          <Option name="labeling/shadowRadiusAlphaOnly" type="QString" value="false"/>
+          <Option name="labeling/shadowRadiusMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shadowRadiusUnits" type="QString" value="1"/>
+          <Option name="labeling/shadowScale" type="QString" value="100"/>
+          <Option name="labeling/shadowTransparency" type="QString" value="30"/>
+          <Option name="labeling/shadowUnder" type="QString" value="0"/>
+          <Option name="labeling/shapeBlendMode" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeBorderColorB" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorG" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderColorR" type="QString" value="128"/>
+          <Option name="labeling/shapeBorderWidth" type="QString" value="0"/>
+          <Option name="labeling/shapeBorderWidthMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeBorderWidthUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeDraw" type="QString" value="true"/>
+          <Option name="labeling/shapeFillColorA" type="QString" value="255"/>
+          <Option name="labeling/shapeFillColorB" type="QString" value="138"/>
+          <Option name="labeling/shapeFillColorG" type="QString" value="0"/>
+          <Option name="labeling/shapeFillColorR" type="QString" value="101"/>
+          <Option name="labeling/shapeJoinStyle" type="QString" value="64"/>
+          <Option name="labeling/shapeOffsetMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeOffsetUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeOffsetX" type="QString" value="0"/>
+          <Option name="labeling/shapeOffsetY" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeRadiiUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeRadiiX" type="QString" value="0"/>
+          <Option name="labeling/shapeRadiiY" type="QString" value="0"/>
+          <Option name="labeling/shapeRotation" type="QString" value="0"/>
+          <Option name="labeling/shapeRotationType" type="QString" value="0"/>
+          <Option name="labeling/shapeSVGFile" type="QString" value=""/>
+          <Option name="labeling/shapeSizeMapUnitScale" type="QString" value="0,0,0,0,0,0"/>
+          <Option name="labeling/shapeSizeType" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeUnits" type="QString" value="1"/>
+          <Option name="labeling/shapeSizeX" type="QString" value="0"/>
+          <Option name="labeling/shapeSizeY" type="QString" value="0"/>
+          <Option name="labeling/shapeTransparency" type="QString" value="0"/>
+          <Option name="labeling/shapeType" type="QString" value="0"/>
+          <Option name="labeling/textColorA" type="QString" value="255"/>
+          <Option name="labeling/textColorB" type="QString" value="255"/>
+          <Option name="labeling/textColorG" type="QString" value="255"/>
+          <Option name="labeling/textColorR" type="QString" value="255"/>
+          <Option name="labeling/textTransp" type="QString" value="0"/>
+          <Option name="labeling/upsidedownLabels" type="QString" value="0"/>
+          <Option name="labeling/wrapChar" type="QString" value=""/>
+          <Option name="labeling/xOffset" type="QString" value="0"/>
+          <Option name="labeling/yOffset" type="QString" value="0"/>
+          <Option name="labeling/zIndex" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -16639,9 +16632,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16649,132 +16642,139 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="position" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="bool" name="IsMultiline" value="false"/>
-                <Option type="bool" name="UseHtml" value="false"/>
+                <Option name="IsMultiline" type="bool" value="false"/>
+                <Option name="UseHtml" type="bool" value="false"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="notes" configurationFlags="None">
+        <field configurationFlags="None" name="notes">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="xyposition" configurationFlags="None">
+        <field configurationFlags="None" name="xyposition">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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_day">
+          <editWidget type="CheckBox">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="csv_firstname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_captain">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_surname" configurationFlags="None">
+        <field configurationFlags="None" name="csv_captain_phone">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_days" configurationFlags="None">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="csv_first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_race">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_last_runner" configurationFlags="None">
+        <field configurationFlags="None" name="csv_first_runner">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_instructions" configurationFlags="None">
+        <field configurationFlags="None" name="csv_last_runner">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="csv_instructions">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -16783,90 +16783,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="position" index="1"/>
-        <alias name="" field="type" index="2"/>
-        <alias name="" field="notes" index="3"/>
-        <alias name="" field="xyposition" index="4"/>
-        <alias name="" field="day" index="5"/>
-        <alias name="" field="csv_position" index="6"/>
-        <alias name="" field="csv_club" index="7"/>
-        <alias name="" field="csv_firstname" index="8"/>
-        <alias name="" field="csv_surname" index="9"/>
-        <alias name="" field="csv_days" index="10"/>
-        <alias name="" field="csv_first_runner" index="11"/>
-        <alias name="" field="csv_last_runner" index="12"/>
-        <alias name="" field="csv_instructions" index="13"/>
+        <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_day" index="6" name=""/>
+        <alias field="csv_position" index="7" name=""/>
+        <alias field="csv_club" index="8" name=""/>
+        <alias field="csv_captain" index="9" name=""/>
+        <alias field="csv_captain_phone" index="10" name=""/>
+        <alias field="csv_race" index="11" name=""/>
+        <alias field="csv_first_runner" index="12" name=""/>
+        <alias field="csv_last_runner" index="13" name=""/>
+        <alias field="csv_instructions" index="14" name=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="notes" expression="" applyOnUpdate="0"/>
+        <default field="xyposition" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="csv_day" expression="" applyOnUpdate="0"/>
+        <default field="csv_position" expression="" applyOnUpdate="0"/>
+        <default field="csv_club" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain" expression="" applyOnUpdate="0"/>
+        <default field="csv_captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="csv_race" expression="" applyOnUpdate="0"/>
+        <default field="csv_first_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_last_runner" expression="" applyOnUpdate="0"/>
+        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="notes" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="xyposition" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_club" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_firstname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_surname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_days" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_first_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_last_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="csv_instructions" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="notes" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="xyposition" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_position" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_club" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_captain" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_captain_phone" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_race" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_first_runner" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_last_runner" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="csv_instructions" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="position" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="notes" desc=""/>
-        <constraint exp="" field="xyposition" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="csv_position" desc=""/>
-        <constraint exp="" field="csv_club" desc=""/>
-        <constraint exp="" field="csv_firstname" desc=""/>
-        <constraint exp="" field="csv_surname" desc=""/>
-        <constraint exp="" field="csv_days" desc=""/>
-        <constraint exp="" field="csv_first_runner" desc=""/>
-        <constraint exp="" field="csv_last_runner" desc=""/>
-        <constraint exp="" field="csv_instructions" desc=""/>
+        <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_day" desc="" exp=""/>
+        <constraint field="csv_position" desc="" exp=""/>
+        <constraint field="csv_club" desc="" exp=""/>
+        <constraint field="csv_captain" desc="" exp=""/>
+        <constraint field="csv_captain_phone" desc="" exp=""/>
+        <constraint field="csv_race" desc="" exp=""/>
+        <constraint field="csv_first_runner" desc="" exp=""/>
+        <constraint field="csv_last_runner" desc="" exp=""/>
+        <constraint field="csv_instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="position" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="notes" hidden="0" width="-1"/>
-          <column type="field" name="xyposition" hidden="0" width="-1"/>
-          <column type="field" name="csv_club" hidden="0" width="-1"/>
-          <column type="field" name="csv_first_runner" hidden="0" width="-1"/>
-          <column type="field" name="csv_last_runner" hidden="0" width="-1"/>
-          <column type="field" name="csv_firstname" hidden="0" width="-1"/>
-          <column type="field" name="csv_surname" hidden="0" width="-1"/>
-          <column type="field" name="csv_position" hidden="0" width="-1"/>
-          <column type="field" name="csv_days" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="csv_instructions" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="notes" type="field" width="-1"/>
+          <column hidden="0" name="xyposition" type="field" width="-1"/>
+          <column hidden="0" name="csv_day" type="field" width="-1"/>
+          <column hidden="0" name="csv_position" type="field" width="-1"/>
+          <column hidden="0" name="csv_club" type="field" width="-1"/>
+          <column hidden="0" name="csv_captain" type="field" width="-1"/>
+          <column hidden="0" name="csv_captain_phone" type="field" width="-1"/>
+          <column hidden="0" name="csv_race" type="field" width="-1"/>
+          <column hidden="0" name="csv_first_runner" type="field" width="-1"/>
+          <column hidden="0" name="csv_last_runner" type="field" width="-1"/>
+          <column hidden="0" name="csv_instructions" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16898,40 +16903,51 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="csv_10_distance" editable="0"/>
-        <field name="csv_21_distance" editable="0"/>
-        <field name="csv_Description" editable="0"/>
-        <field name="csv_capt_1" editable="1"/>
-        <field name="csv_captai" editable="1"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_email" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_captain_phone" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_days" editable="0"/>
-        <field name="csv_email" editable="0"/>
-        <field name="csv_first runner" editable="0"/>
-        <field name="csv_first_" editable="1"/>
-        <field name="csv_first_runner" editable="0"/>
-        <field name="csv_firstname" editable="0"/>
-        <field name="csv_instru" editable="1"/>
-        <field name="csv_instructions" editable="0"/>
-        <field name="csv_last runner" editable="0"/>
-        <field name="csv_last_r" editable="1"/>
-        <field name="csv_last_runner" editable="0"/>
-        <field name="csv_name" editable="0"/>
-        <field name="csv_phone" editable="0"/>
-        <field name="csv_positi" editable="1"/>
-        <field name="csv_position" editable="0"/>
-        <field name="csv_races" editable="0"/>
-        <field name="csv_surname" editable="0"/>
-        <field name="day" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="notes" editable="1"/>
-        <field name="oldpositio" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="xyposition" editable="1"/>
+        <field editable="0" name="csv_10_distance"/>
+        <field editable="0" name="csv_21_distance"/>
+        <field editable="0" name="csv_Description"/>
+        <field editable="1" name="csv_capt_1"/>
+        <field editable="1" name="csv_captai"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_email"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_captain_phone"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_day"/>
+        <field editable="0" name="csv_days"/>
+        <field editable="0" name="csv_email"/>
+        <field editable="0" name="csv_first runner"/>
+        <field editable="1" name="csv_first_"/>
+        <field editable="0" name="csv_first_runner"/>
+        <field editable="0" name="csv_firstname"/>
+        <field editable="1" name="csv_instru"/>
+        <field editable="0" name="csv_instructions"/>
+        <field editable="0" name="csv_last runner"/>
+        <field editable="1" name="csv_last_r"/>
+        <field editable="0" name="csv_last_runner"/>
+        <field editable="0" name="csv_name"/>
+        <field editable="0" name="csv_phone"/>
+        <field editable="1" name="csv_positi"/>
+        <field editable="0" name="csv_position"/>
+        <field editable="0" name="csv_race"/>
+        <field editable="0" name="csv_races"/>
+        <field editable="0" name="csv_surname"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="marshals_by_position_captain"/>
+        <field editable="0" name="marshals_by_position_captain_phone"/>
+        <field editable="0" name="marshals_by_position_club"/>
+        <field editable="0" name="marshals_by_position_day"/>
+        <field editable="0" name="marshals_by_position_first_runner"/>
+        <field editable="0" name="marshals_by_position_instructions"/>
+        <field editable="0" name="marshals_by_position_last_runner"/>
+        <field editable="0" name="marshals_by_position_position"/>
+        <field editable="0" name="marshals_by_position_race"/>
+        <field editable="1" name="notes"/>
+        <field editable="1" name="oldpositio"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="xyposition"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="csv_10_distance"/>
@@ -16944,6 +16960,7 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="csv_captain_number"/>
         <field labelOnTop="0" name="csv_captain_phone"/>
         <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_day"/>
         <field labelOnTop="0" name="csv_days"/>
         <field labelOnTop="0" name="csv_email"/>
         <field labelOnTop="0" name="csv_first runner"/>
@@ -16959,10 +16976,20 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="csv_phone"/>
         <field labelOnTop="0" name="csv_positi"/>
         <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_race"/>
         <field labelOnTop="0" name="csv_races"/>
         <field labelOnTop="0" name="csv_surname"/>
         <field labelOnTop="0" name="day"/>
         <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="marshals_by_position_captain"/>
+        <field labelOnTop="0" name="marshals_by_position_captain_phone"/>
+        <field labelOnTop="0" name="marshals_by_position_club"/>
+        <field labelOnTop="0" name="marshals_by_position_day"/>
+        <field labelOnTop="0" name="marshals_by_position_first_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_instructions"/>
+        <field labelOnTop="0" name="marshals_by_position_last_runner"/>
+        <field labelOnTop="0" name="marshals_by_position_position"/>
+        <field labelOnTop="0" name="marshals_by_position_race"/>
         <field labelOnTop="0" name="notes"/>
         <field labelOnTop="0" name="oldpositio"/>
         <field labelOnTop="0" name="position"/>
@@ -16970,27 +16997,38 @@ def my_form_open(dialog, layer, feature):
         <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_day"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_race"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain"/>
+        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
+        <field reuseLastValue="0" name="marshals_by_position_club"/>
+        <field reuseLastValue="0" name="marshals_by_position_day"/>
+        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
+        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
+        <field reuseLastValue="0" name="marshals_by_position_position"/>
+        <field reuseLastValue="0" name="marshals_by_position_race"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -17040,24 +17078,24 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer minScale="1e+08" autoRefreshTime="0" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry" readOnly="0" refreshOnNotifyMessage="" geometry="No geometry" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" legendPlaceholderImage="" maxScale="100000">
+    <maplayer refreshOnNotifyMessage="" autoRefreshTime="0" maxScale="100000" minScale="1e+08" readOnly="0" wkbType="NoGeometry" autoRefreshEnabled="0" styleCategories="AllStyleCategories" legendPlaceholderImage="" geometry="No geometry" type="vector" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0">
       <id>marshals_by_position20161003112326575</id>
-      <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
+      <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
         <value></value>
       </keywordList>
       <layername>marshals_by_position</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>
+          <wkt></wkt>
+          <proj4></proj4>
+          <srsid>0</srsid>
+          <srid>0</srid>
+          <authid></authid>
+          <description></description>
+          <projectionacronym></projectionacronym>
+          <ellipsoidacronym></ellipsoidacronym>
+          <geographicflag>false</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
@@ -17093,7 +17131,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17102,13 +17140,10 @@ def my_form_open(dialog, layer, feature):
           </temporal>
         </extent>
       </resourceMetadata>
-      <provider encoding="UTF-8">delimitedtext</provider>
+      <provider encoding="">delimitedtext</provider>
       <vectorjoins/>
       <layerDependencies/>
-      <dataDependencies>
-        <layer id="all_routes20170907054841602"/>
-        <layer id="marshal_positions20160930121322287"/>
-      </dataDependencies>
+      <dataDependencies/>
       <expressionfields/>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -17121,58 +17156,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="243,166,178,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="243,166,178,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17203,36 +17238,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="243,166,178,255" k="color"/>
@@ -17247,44 +17282,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="243,166,178,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="174,119,127,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="243,166,178,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="174,119,127,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17307,9 +17342,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -17318,143 +17353,96 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="first_name"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="first_name"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames"/>
+          <Option name="variableValues"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="position" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="club" configurationFlags="None">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field name="firstname" configurationFlags="None">
+        <field configurationFlags="None" name="day">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="surname" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="phone" configurationFlags="None">
+        <field configurationFlags="None" name="club">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="email" configurationFlags="None">
+        <field configurationFlags="None" name="captain">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="captain" configurationFlags="None">
+        <field configurationFlags="None" name="captain_phone">
           <editWidget type="TextEdit">
             <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
+              <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="captain_phone" configurationFlags="None">
+        <field configurationFlags="None" name="race">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="captain_email" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="days" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="races" configurationFlags="None">
+        <field configurationFlags="None" name="first_runner">
           <editWidget type="TextEdit">
             <config>
-              <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
-              </Option>
+              <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="first_runner" configurationFlags="None">
+        <field configurationFlags="None" name="last_runner">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field configurationFlags="None" name="distance">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="last_runner" configurationFlags="None">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field name="instructions" configurationFlags="None">
-          <editWidget type="">
+        <field configurationFlags="None" name="instructions">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -17462,94 +17450,75 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="position" index="0"/>
-        <alias name="" field="club" index="1"/>
-        <alias name="" field="firstname" index="2"/>
-        <alias name="" field="surname" index="3"/>
-        <alias name="" field="name" index="4"/>
-        <alias name="" field="phone" index="5"/>
-        <alias name="" field="email" index="6"/>
-        <alias name="" field="captain" index="7"/>
-        <alias name="" field="captain_phone" index="8"/>
-        <alias name="" field="captain_email" index="9"/>
-        <alias name="" field="days" index="10"/>
-        <alias name="" field="races" index="11"/>
-        <alias name="" field="first_runner" index="12"/>
-        <alias name="" field="last_runner" index="13"/>
-        <alias name="" field="instructions" index="14"/>
+        <alias field="day" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="club" index="2" name=""/>
+        <alias field="captain" index="3" name=""/>
+        <alias field="captain_phone" index="4" name=""/>
+        <alias field="race" index="5" name=""/>
+        <alias field="first_runner" index="6" name=""/>
+        <alias field="last_runner" index="7" name=""/>
+        <alias field="distance" index="8" name=""/>
+        <alias field="instructions" index="9" name=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="position" expression="" applyOnUpdate="0"/>
+        <default field="club" expression="" applyOnUpdate="0"/>
+        <default field="captain" expression="" applyOnUpdate="0"/>
+        <default field="captain_phone" expression="" applyOnUpdate="0"/>
+        <default field="race" expression="" applyOnUpdate="0"/>
+        <default field="first_runner" expression="" applyOnUpdate="0"/>
+        <default field="last_runner" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="instructions" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="position" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="club" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="firstname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="surname" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="phone" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="email" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain_phone" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="captain_email" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="days" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="races" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="first_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="last_runner" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="instructions" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="club" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="captain" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="captain_phone" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="race" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="first_runner" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="last_runner" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="instructions" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="position" desc=""/>
-        <constraint exp="" field="club" desc=""/>
-        <constraint exp="" field="firstname" desc=""/>
-        <constraint exp="" field="surname" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="phone" desc=""/>
-        <constraint exp="" field="email" desc=""/>
-        <constraint exp="" field="captain" desc=""/>
-        <constraint exp="" field="captain_phone" desc=""/>
-        <constraint exp="" field="captain_email" desc=""/>
-        <constraint exp="" field="days" desc=""/>
-        <constraint exp="" field="races" desc=""/>
-        <constraint exp="" field="first_runner" desc=""/>
-        <constraint exp="" field="last_runner" desc=""/>
-        <constraint exp="" field="instructions" desc=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="club" desc="" exp=""/>
+        <constraint field="captain" desc="" exp=""/>
+        <constraint field="captain_phone" desc="" exp=""/>
+        <constraint field="race" desc="" exp=""/>
+        <constraint field="first_runner" desc="" exp=""/>
+        <constraint field="last_runner" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="position" hidden="0" width="-1"/>
-          <column type="field" name="name" hidden="0" width="221"/>
-          <column type="field" name="club" hidden="0" width="-1"/>
-          <column type="field" name="phone" hidden="0" width="-1"/>
-          <column type="field" name="email" hidden="0" width="-1"/>
-          <column type="field" name="captain" hidden="0" width="-1"/>
-          <column type="field" name="races" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="first_runner" hidden="0" width="-1"/>
-          <column type="field" name="last_runner" hidden="0" width="-1"/>
-          <column type="field" name="instructions" hidden="0" width="-1"/>
-          <column type="field" name="firstname" hidden="0" width="-1"/>
-          <column type="field" name="surname" hidden="0" width="-1"/>
-          <column type="field" name="captain_phone" hidden="0" width="-1"/>
-          <column type="field" name="captain_email" hidden="0" width="-1"/>
+          <column hidden="0" name="position" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="221"/>
+          <column hidden="0" name="club" type="field" width="-1"/>
+          <column hidden="0" name="phone" type="field" width="-1"/>
+          <column hidden="0" name="email" type="field" width="-1"/>
+          <column hidden="0" name="captain" type="field" width="-1"/>
+          <column hidden="0" name="races" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="first_runner" type="field" width="-1"/>
+          <column hidden="0" name="last_runner" type="field" width="-1"/>
+          <column hidden="0" name="instructions" type="field" width="-1"/>
+          <column hidden="0" name="firstname" type="field" width="-1"/>
+          <column hidden="0" name="surname" type="field" width="-1"/>
+          <column hidden="0" name="captain_phone" type="field" width="-1"/>
+          <column hidden="0" name="days" type="field" width="-1"/>
+          <column hidden="0" name="captain_email" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17581,34 +17550,43 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="10_distance" editable="1"/>
-        <field name="21_distance" editable="1"/>
-        <field name="5_distance" editable="1"/>
-        <field name="captain" editable="1"/>
-        <field name="captain_number" editable="1"/>
-        <field name="club" editable="1"/>
-        <field name="email" editable="1"/>
-        <field name="first_name" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="instructions" editable="1"/>
-        <field name="last_name" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="phone" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="tshirt" editable="1"/>
+        <field editable="1" name="10_distance"/>
+        <field editable="1" name="21_distance"/>
+        <field editable="1" name="5_distance"/>
+        <field editable="1" name="captain"/>
+        <field editable="1" name="captain_email"/>
+        <field editable="1" name="captain_number"/>
+        <field editable="1" name="captain_phone"/>
+        <field editable="1" name="club"/>
+        <field editable="1" name="days"/>
+        <field editable="1" name="email"/>
+        <field editable="1" name="first_name"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="firstname"/>
+        <field editable="1" name="instructions"/>
+        <field editable="1" name="last_name"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="phone"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="surname"/>
+        <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="10_distance"/>
         <field labelOnTop="0" name="21_distance"/>
         <field labelOnTop="0" name="5_distance"/>
         <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_email"/>
         <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="captain_phone"/>
         <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="days"/>
         <field labelOnTop="0" name="email"/>
         <field labelOnTop="0" name="first_name"/>
         <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="firstname"/>
         <field labelOnTop="0" name="instructions"/>
         <field labelOnTop="0" name="last_name"/>
         <field labelOnTop="0" name="last_runner"/>
@@ -17616,15 +17594,32 @@ def my_form_open(dialog, layer, feature):
         <field labelOnTop="0" name="phone"/>
         <field labelOnTop="0" name="position"/>
         <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="surname"/>
         <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="captain"/>
+        <field reuseLastValue="0" name="captain_email"/>
+        <field reuseLastValue="0" name="captain_phone"/>
+        <field reuseLastValue="0" name="club"/>
+        <field reuseLastValue="0" name="days"/>
+        <field reuseLastValue="0" name="email"/>
+        <field reuseLastValue="0" name="first_runner"/>
+        <field reuseLastValue="0" name="firstname"/>
+        <field reuseLastValue="0" name="instructions"/>
+        <field reuseLastValue="0" name="last_runner"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="phone"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="surname"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -17689,7 +17684,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17714,58 +17709,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="141,90,153,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="141,90,153,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17796,36 +17791,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="141,90,153,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="101,64,109,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="141,90,153,255" k="color"/>
@@ -17840,44 +17835,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="141,90,153,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="101,64,109,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="141,90,153,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="101,64,109,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -17900,58 +17895,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" filter="&quot;type&quot; IS 'car'" symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule label="Walking" filter="&quot;type&quot; IS 'walk'" symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car" filter="&quot;type&quot; IS 'car'"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="123,211,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -17982,50 +17977,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="4;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1.25"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -18056,30 +18051,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -18099,33 +18094,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -18141,32 +18136,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -18181,9 +18176,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -18196,60 +18191,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18280,9 +18275,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18290,30 +18285,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -18322,30 +18317,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18377,8 +18372,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -18390,7 +18385,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -18455,7 +18450,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18480,58 +18475,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="232,113,141,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="232,113,141,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -18562,36 +18557,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="232,113,141,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="166,81,101,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="232,113,141,255" k="color"/>
@@ -18606,44 +18601,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="232,113,141,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="166,81,101,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="232,113,141,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="166,81,101,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -18666,44 +18661,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="0.75" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="8.5" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="name" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="8.5" capitalization="0" fieldName="name" multilineHeight="1" useSubstitutions="0" textOpacity="0.75" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="64" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1.5"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1.5" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -18718,158 +18713,158 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelRotation">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                    <Option type="int" name="type" value="3"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelRotation" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="PositionX">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="field" value="label_x"/>
-                    <Option type="int" name="type" value="2"/>
+                  <Option name="PositionX" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_x"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
-                  <Option type="Map" name="PositionY">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="field" value="label_y"/>
-                    <Option type="int" name="type" value="2"/>
+                  <Option name="PositionY" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="field" type="QString" value="label_y"/>
+                    <Option name="type" type="int" value="2"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                    <Option type="int" name="type" value="3"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="1" placementFlags="2" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="0.20000000000000001" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="1" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="0.20000000000000001"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;name&quot;"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;name&quot;"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -18900,9 +18895,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18910,173 +18905,173 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="osm_id" configurationFlags="None">
+        <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="type" configurationFlags="None">
+        <field configurationFlags="None" name="type">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="z_order" configurationFlags="None">
+        <field configurationFlags="None" name="z_order">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="population" configurationFlags="None">
+        <field configurationFlags="None" name="population">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_x" configurationFlags="None">
+        <field configurationFlags="None" name="label_x">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_y" configurationFlags="None">
+        <field configurationFlags="None" name="label_y">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label_rota" configurationFlags="None">
+        <field configurationFlags="None" name="label_rota">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="osm_id" index="1"/>
-        <alias name="" field="name" index="2"/>
-        <alias name="" field="type" index="3"/>
-        <alias name="" field="z_order" index="4"/>
-        <alias name="" field="population" index="5"/>
-        <alias name="" field="label_x" index="6"/>
-        <alias name="" field="label_y" index="7"/>
-        <alias name="" field="label_rota" index="8"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="population" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="osm_id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="z_order" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="population" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_x" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_y" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_rota" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="osm_id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="z_order" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="population" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_x" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_y" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_rota" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="osm_id" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="z_order" desc=""/>
-        <constraint exp="" field="population" desc=""/>
-        <constraint exp="" field="label_x" desc=""/>
-        <constraint exp="" field="label_y" desc=""/>
-        <constraint exp="" field="label_rota" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="osm_id" hidden="0" width="-1"/>
-          <column type="field" name="name" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="field" name="z_order" hidden="0" width="-1"/>
-          <column type="field" name="population" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="label_x" hidden="0" width="-1"/>
-          <column type="field" name="label_y" hidden="0" width="-1"/>
-          <column type="field" name="label_rota" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="osm_id" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="0" name="z_order" type="field" width="-1"/>
+          <column hidden="0" name="population" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="label_x" type="field" width="-1"/>
+          <column hidden="0" name="label_y" type="field" width="-1"/>
+          <column hidden="0" name="label_rota" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19108,15 +19103,15 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="osm_id" editable="1"/>
-        <field name="population" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="population"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -19135,7 +19130,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -19200,7 +19195,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19225,58 +19220,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,158,23,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,158,23,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -19307,36 +19302,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,158,23,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="182,113,16,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,158,23,255" k="color"/>
@@ -19351,44 +19346,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="255,158,23,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="182,113,16,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="255,158,23,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="182,113,16,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -19411,52 +19406,52 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="0.80000000000000004" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="7" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="7" capitalization="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="0.80000000000000004" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="196,60,57,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="2"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="196,60,57,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="2"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -19479,34 +19474,34 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -19521,107 +19516,107 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="0" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MapUnit" priority="3" placementFlags="4" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="3" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="LineGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="0.29999999999999999" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="5" fontLimitPixelSize="0" mergeLines="1" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="0"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="4" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="3" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MapUnit" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="LineGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="5" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="1" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="0.29999999999999999"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="AlwaysShow">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="always_sho"/>
-                  <Option type="int" name="type" value="2"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="AlwaysShow" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="always_sho"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="IsObstacle">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="&quot;&quot;"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="IsObstacle" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="&quot;&quot;"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="LabelRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="360 - (&quot;label_rota&quot;)"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="LabelRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="360 - (&quot;label_rota&quot;)"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="PositionX">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_x"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionX" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_x"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="PositionY">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="label_y"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="PositionY" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="label_y"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Priority">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="Priority" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="Show">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="auxiliary_storage_labeling_show"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="Show" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="auxiliary_storage_labeling_show"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
@@ -19632,56 +19627,56 @@ def my_form_open(dialog, layer, feature):
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -19712,9 +19707,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19722,137 +19717,137 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="name" configurationFlags="None">
+        <field configurationFlags="None" name="name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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/>
@@ -19861,100 +19856,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="osm_id" index="0"/>
-        <alias name="" field="name" index="1"/>
-        <alias name="" field="highway" index="2"/>
-        <alias name="" field="waterway" index="3"/>
-        <alias name="" field="aerialway" index="4"/>
-        <alias name="" field="barrier" index="5"/>
-        <alias name="" field="man_made" index="6"/>
-        <alias name="" field="z_order" index="7"/>
-        <alias name="" field="other_tags" index="8"/>
-        <alias name="" field="never_show" index="9"/>
-        <alias name="" field="label_x" index="10"/>
-        <alias name="" field="label_y" index="11"/>
-        <alias name="" field="label_rota" index="12"/>
-        <alias name="" field="always_sho" index="13"/>
-        <alias name="" field="resident_a" index="14"/>
-        <alias name="" field="auxiliary_storage_labeling_show" index="15"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="osm_id" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="highway" expression="" applyOnUpdate="0"/>
+        <default field="waterway" expression="" applyOnUpdate="0"/>
+        <default field="aerialway" expression="" applyOnUpdate="0"/>
+        <default field="barrier" expression="" applyOnUpdate="0"/>
+        <default field="man_made" expression="" applyOnUpdate="0"/>
+        <default field="z_order" expression="" applyOnUpdate="0"/>
+        <default field="other_tags" expression="" applyOnUpdate="0"/>
+        <default field="never_show" expression="" applyOnUpdate="0"/>
+        <default field="label_x" expression="" applyOnUpdate="0"/>
+        <default field="label_y" expression="" applyOnUpdate="0"/>
+        <default field="label_rota" expression="" applyOnUpdate="0"/>
+        <default field="always_sho" expression="" applyOnUpdate="0"/>
+        <default field="resident_a" expression="" applyOnUpdate="0"/>
+        <default field="auxiliary_storage_labeling_show" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="osm_id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="highway" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="waterway" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="aerialway" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="barrier" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="man_made" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="z_order" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="other_tags" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="never_show" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_x" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_y" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label_rota" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="always_sho" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="resident_a" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="osm_id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="highway" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="waterway" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="aerialway" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="barrier" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="man_made" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="z_order" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="other_tags" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="never_show" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_x" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_y" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label_rota" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="always_sho" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="resident_a" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="auxiliary_storage_labeling_show" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="osm_id" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="highway" desc=""/>
-        <constraint exp="" field="waterway" desc=""/>
-        <constraint exp="" field="aerialway" desc=""/>
-        <constraint exp="" field="barrier" desc=""/>
-        <constraint exp="" field="man_made" desc=""/>
-        <constraint exp="" field="z_order" desc=""/>
-        <constraint exp="" field="other_tags" desc=""/>
-        <constraint exp="" field="never_show" desc=""/>
-        <constraint exp="" field="label_x" desc=""/>
-        <constraint exp="" field="label_y" desc=""/>
-        <constraint exp="" field="label_rota" desc=""/>
-        <constraint exp="" field="always_sho" desc=""/>
-        <constraint exp="" field="resident_a" desc=""/>
-        <constraint exp="" field="auxiliary_storage_labeling_show" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="osm_id" hidden="0" width="-1"/>
-          <column type="field" name="name" hidden="0" width="160"/>
-          <column type="field" name="z_order" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="highway" hidden="0" width="-1"/>
-          <column type="field" name="waterway" hidden="0" width="-1"/>
-          <column type="field" name="aerialway" hidden="0" width="-1"/>
-          <column type="field" name="barrier" hidden="0" width="-1"/>
-          <column type="field" name="man_made" hidden="0" width="-1"/>
-          <column type="field" name="other_tags" hidden="0" width="142"/>
-          <column type="field" name="never_show" hidden="0" width="-1"/>
-          <column type="field" name="label_x" hidden="0" width="-1"/>
-          <column type="field" name="label_y" hidden="0" width="-1"/>
-          <column type="field" name="label_rota" hidden="0" width="-1"/>
-          <column type="field" name="always_sho" hidden="0" width="-1"/>
-          <column type="field" name="resident_a" hidden="0" width="-1"/>
-          <column type="field" name="auxiliary_storage_labeling_show" hidden="0" width="-1"/>
+          <column hidden="0" name="osm_id" type="field" width="-1"/>
+          <column hidden="0" name="name" type="field" width="160"/>
+          <column hidden="0" name="z_order" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="highway" type="field" width="-1"/>
+          <column hidden="0" name="waterway" type="field" width="-1"/>
+          <column hidden="0" name="aerialway" type="field" width="-1"/>
+          <column hidden="0" name="barrier" type="field" width="-1"/>
+          <column hidden="0" name="man_made" type="field" width="-1"/>
+          <column hidden="0" name="other_tags" type="field" width="142"/>
+          <column hidden="0" name="never_show" type="field" width="-1"/>
+          <column hidden="0" name="label_x" type="field" width="-1"/>
+          <column hidden="0" name="label_y" type="field" width="-1"/>
+          <column hidden="0" name="label_rota" type="field" width="-1"/>
+          <column hidden="0" name="always_sho" type="field" width="-1"/>
+          <column hidden="0" name="resident_a" type="field" width="-1"/>
+          <column hidden="0" name="auxiliary_storage_labeling_show" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19986,40 +19981,40 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="aerialway" editable="1"/>
-        <field name="always_sho" editable="1"/>
-        <field name="auxiliary_storage_labeling_show" editable="0"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="0" name="auxiliary_storage_labeling_show"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="aerialway"/>
@@ -20058,22 +20053,22 @@ def my_form_open(dialog, layer, feature):
         <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>
@@ -20123,7 +20118,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -20188,7 +20183,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -20213,58 +20208,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="231,113,72,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="231,113,72,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -20295,36 +20290,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="231,113,72,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="165,81,51,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="231,113,72,255" k="color"/>
@@ -20339,44 +20334,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="231,113,72,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="165,81,51,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="231,113,72,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="165,81,51,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -20399,54 +20394,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="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}"/>
-          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1" filter="&quot;type&quot; = 'toilets'"/>
+          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2" filter="&quot;type&quot; = 'togbag'"/>
+          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3" filter=" &quot;type&quot; = 'closure'"/>
+          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4" filter="&quot;type&quot; = 'myciti'"/>
+          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="name" value="star"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.5"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="7"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="name" type="QString" value="star"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.5"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -20469,47 +20464,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '7' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '7' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,32,80,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="amenity/amenity_toilets.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,32,80,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="amenity/amenity_toilets.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="7"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="7"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,32,80,255" k="color"/>
@@ -20531,47 +20526,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="../images/gym-bag.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/gym-bag.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,0,0,255" k="color"/>
@@ -20593,57 +20588,57 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="3" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="../images/road_closure.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="../images/road_closure.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="125,139,143,255" k="color"/>
@@ -20665,47 +20660,47 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '6' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '6' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="4" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="4" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="0,12,254,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="transport/transport_bus_stop.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="255,255,255,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="0,12,254,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/transport_bus_stop.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="255,255,255,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="0,12,254,255" k="color"/>
@@ -20725,21 +20720,21 @@ def my_form_open(dialog, layer, feature):
               <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"/>
-              <effect type="effectStack" enabled="0">
+              <effect enabled="0" type="effectStack">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="13"/>
-                    <Option type="QString" name="blur_level" value="2.645"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="offset_angle" value="135"/>
-                    <Option type="QString" name="offset_distance" value="2"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <Option name="blend_mode" type="QString" value="13"/>
+                    <Option name="blur_level" type="QString" value="2.645"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="offset_angle" type="QString" value="135"/>
+                    <Option name="offset_distance" type="QString" value="2"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -20756,24 +20751,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="blur_level" value="0.7935"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color1" value="0,0,255,255"/>
-                    <Option type="QString" name="color2" value="0,255,0,255"/>
-                    <Option type="QString" name="color_type" value="0"/>
-                    <Option type="QString" name="direction" value="ccw"/>
-                    <Option type="QString" name="discrete" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="1"/>
-                    <Option type="QString" name="opacity" value="0.5"/>
-                    <Option type="QString" name="rampType" value="gradient"/>
-                    <Option type="QString" name="single_color" value="255,255,255,255"/>
-                    <Option type="QString" name="spec" value="rgb"/>
-                    <Option type="QString" name="spread" value="2"/>
-                    <Option type="QString" name="spread_unit" value="MM"/>
-                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color1" type="QString" value="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="1"/>
+                    <Option name="opacity" type="QString" value="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <Option name="spread" type="QString" value="2"/>
+                    <Option name="spread_unit" type="QString" value="MM"/>
+                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20796,10 +20791,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="1"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="1"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="2" k="draw_mode"/>
@@ -20808,18 +20803,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="13"/>
-                    <Option type="QString" name="blur_level" value="2.645"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="0,0,0,255"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="offset_angle" value="135"/>
-                    <Option type="QString" name="offset_distance" value="2"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="offset_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="opacity" value="1"/>
+                    <Option name="blend_mode" type="QString" value="13"/>
+                    <Option name="blur_level" type="QString" value="2.645"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="0,0,0,255"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="offset_angle" type="QString" value="135"/>
+                    <Option name="offset_distance" type="QString" value="2"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="offset_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="opacity" type="QString" value="1"/>
                   </Option>
                   <prop v="13" k="blend_mode"/>
                   <prop v="2.645" k="blur_level"/>
@@ -20836,24 +20831,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option type="QString" name="blend_mode" value="0"/>
-                    <Option type="QString" name="blur_level" value="0.7935"/>
-                    <Option type="QString" name="blur_unit" value="MM"/>
-                    <Option type="QString" name="blur_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color1" value="0,0,255,255"/>
-                    <Option type="QString" name="color2" value="0,255,0,255"/>
-                    <Option type="QString" name="color_type" value="0"/>
-                    <Option type="QString" name="direction" value="ccw"/>
-                    <Option type="QString" name="discrete" value="0"/>
-                    <Option type="QString" name="draw_mode" value="2"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="opacity" value="0.5"/>
-                    <Option type="QString" name="rampType" value="gradient"/>
-                    <Option type="QString" name="single_color" value="255,255,255,255"/>
-                    <Option type="QString" name="spec" value="rgb"/>
-                    <Option type="QString" name="spread" value="2"/>
-                    <Option type="QString" name="spread_unit" value="MM"/>
-                    <Option type="QString" name="spread_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option name="blend_mode" type="QString" value="0"/>
+                    <Option name="blur_level" type="QString" value="0.7935"/>
+                    <Option name="blur_unit" type="QString" value="MM"/>
+                    <Option name="blur_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color1" type="QString" value="0,0,255,255"/>
+                    <Option name="color2" type="QString" value="0,255,0,255"/>
+                    <Option name="color_type" type="QString" value="0"/>
+                    <Option name="direction" type="QString" value="ccw"/>
+                    <Option name="discrete" type="QString" value="0"/>
+                    <Option name="draw_mode" type="QString" value="2"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="opacity" type="QString" value="0.5"/>
+                    <Option name="rampType" type="QString" value="gradient"/>
+                    <Option name="single_color" type="QString" value="255,255,255,255"/>
+                    <Option name="spec" type="QString" value="rgb"/>
+                    <Option name="spread" type="QString" value="2"/>
+                    <Option name="spread_unit" type="QString" value="MM"/>
+                    <Option name="spread_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop v="0" k="blend_mode"/>
                   <prop v="0.7935" k="blur_level"/>
@@ -20877,47 +20872,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="marker" name="5" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="5" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer class="SvgMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="color" value="43,153,41,255"/>
-                <Option type="QString" name="fixedAspectRatio" value="0"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="name" value="transport/amenity=parking.svg"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="color" type="QString" value="43,153,41,255"/>
+                <Option name="fixedAspectRatio" type="QString" value="0"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="name" type="QString" value="transport/amenity=parking.svg"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
                 <Option name="parameters"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="6"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="6"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="43,153,41,255" k="color"/>
@@ -20939,15 +20934,15 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '10', '5' )"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '10', '5' )"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20956,32 +20951,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="name" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" fieldName="name" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="0.80000000000000004" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="2"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="2" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeRadiiY="2" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="0.69999999999999996" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="2" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="1" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="2" shapeOpacity="0.69999999999999996" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -20996,148 +20991,148 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="LabelDistance">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                    <Option type="int" name="type" value="3"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="LabelDistance" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="OffsetQuad">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="2"/>
-                    <Option type="int" name="type" value="3"/>
+                  <Option name="OffsetQuad" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="2"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
-                  <Option type="Map" name="Size">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                    <Option type="int" name="type" value="3"/>
+                  <Option name="Size" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" placement="0" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="2" dist="3" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="2" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1.8" zIndex="10" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="3" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="2" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="2" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="3" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="10" fontLimitPixelSize="0" obstacleFactor="1.8"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="LabelDistance">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '5', '3' )"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="LabelDistance" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '5', '3' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="OffsetQuad">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="2"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="OffsetQuad" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="2"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="Size">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="if( @map_scale &lt; 7000, '14', '10' )"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="Size" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="if( @map_scale &lt; 7000, '14', '10' )"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -21168,9 +21163,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21178,44 +21173,44 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -21224,40 +21219,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
-        <alias name="" field="name" index="2"/>
-        <alias name="" field="distance" index="3"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="distance" index="3" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="name" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="distance" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="name" desc=""/>
-        <constraint exp="" field="distance" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="name" hidden="0" width="-1"/>
-          <column type="field" name="distance" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="name" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21289,10 +21284,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="distance" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="distance"/>
@@ -21306,7 +21301,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -21379,58 +21374,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="152,125,183,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="152,125,183,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -21461,36 +21456,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="109,89,131,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="152,125,183,255" k="color"/>
@@ -21505,44 +21500,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="152,125,183,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="109,89,131,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="152,125,183,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="109,89,131,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -21565,42 +21560,42 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
+            <layer class="LinePatternFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="135"/>
-                <Option type="QString" name="clip_mode" value="during_render"/>
-                <Option type="QString" name="color" value="211,134,33,255"/>
-                <Option type="QString" name="coordinate_reference" value="feature"/>
-                <Option type="QString" name="distance" value="2"/>
-                <Option type="QString" name="distance_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="distance_unit" value="MM"/>
-                <Option type="QString" name="line_width" value="0.26"/>
-                <Option type="QString" name="line_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
+                <Option name="angle" type="QString" value="135"/>
+                <Option name="clip_mode" type="QString" value="during_render"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="coordinate_reference" type="QString" value="feature"/>
+                <Option name="distance" type="QString" value="2"/>
+                <Option name="distance_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="distance_unit" type="QString" value="MM"/>
+                <Option name="line_width" type="QString" value="0.26"/>
+                <Option name="line_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
               </Option>
               <prop v="135" k="angle"/>
               <prop v="during_render" k="clip_mode"/>
@@ -21619,48 +21614,48 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="outline_width_unit"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="line" name="@0@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@0@0" clip_to_extent="1" type="line" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="align_dash_pattern" value="0"/>
-                    <Option type="QString" name="capstyle" value="square"/>
-                    <Option type="QString" name="customdash" value="5;2"/>
-                    <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="customdash_unit" value="MM"/>
-                    <Option type="QString" name="dash_pattern_offset" value="0"/>
-                    <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                    <Option type="QString" name="draw_inside_polygon" value="0"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="line_color" value="211,134,33,255"/>
-                    <Option type="QString" name="line_style" value="solid"/>
-                    <Option type="QString" name="line_width" value="0.3"/>
-                    <Option type="QString" name="line_width_unit" value="MM"/>
-                    <Option type="QString" name="offset" value="0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="ring_filter" value="0"/>
-                    <Option type="QString" name="trim_distance_end" value="0"/>
-                    <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                    <Option type="QString" name="trim_distance_start" value="0"/>
-                    <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                    <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                    <Option type="QString" name="use_custom_dash" value="0"/>
-                    <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                    <Option name="align_dash_pattern" type="QString" value="0"/>
+                    <Option name="capstyle" type="QString" value="square"/>
+                    <Option name="customdash" type="QString" value="5;2"/>
+                    <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="customdash_unit" type="QString" value="MM"/>
+                    <Option name="dash_pattern_offset" type="QString" value="0"/>
+                    <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                    <Option name="draw_inside_polygon" type="QString" value="0"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="line_color" type="QString" value="211,134,33,255"/>
+                    <Option name="line_style" type="QString" value="solid"/>
+                    <Option name="line_width" type="QString" value="0.3"/>
+                    <Option name="line_width_unit" type="QString" value="MM"/>
+                    <Option name="offset" type="QString" value="0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="ring_filter" type="QString" value="0"/>
+                    <Option name="trim_distance_end" type="QString" value="0"/>
+                    <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                    <Option name="trim_distance_start" type="QString" value="0"/>
+                    <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                    <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                    <Option name="use_custom_dash" type="QString" value="0"/>
+                    <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                   </Option>
                   <prop v="0" k="align_dash_pattern"/>
                   <prop v="square" k="capstyle"/>
@@ -21691,27 +21686,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 type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="211,134,33,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.46"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="no"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="211,134,33,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.46"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="no"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="211,134,33,255" k="color"/>
@@ -21726,9 +21721,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="no" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21739,60 +21734,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -21823,9 +21818,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21833,23 +21828,23 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="1" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="1" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field name="FID" configurationFlags="None">
+        <field configurationFlags="None" name="FID">
           <editWidget type="">
             <config>
               <Option/>
@@ -21858,26 +21853,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="FID" index="0"/>
+        <alias field="FID" index="0" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="FID"/>
+        <default field="FID" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="FID" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="FID" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="FID" desc=""/>
+        <constraint field="FID" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="431"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="431"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21909,8 +21904,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -21922,7 +21917,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21987,7 +21982,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22012,58 +22007,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,207,80,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,207,80,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22094,36 +22089,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,207,80,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,148,57,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,207,80,255" k="color"/>
@@ -22138,44 +22133,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,207,80,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,148,57,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,207,80,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,148,57,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -22198,61 +22193,61 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" filter="&quot;status&quot; = 'open'" symbol="0" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule label="No Parking" filter="&quot;status&quot; = 'no-parking'" symbol="1" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" symbol="2" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule label="One-Way" filter="&quot;status&quot; = 'one-way'" symbol="3" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule label="Road Closures" filter="&quot;status&quot; = 'closure'" symbol="4" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" label="Road Open" filter="&quot;status&quot; = 'open'"/>
+          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" label="No Parking" filter="&quot;status&quot; = 'no-parking'"/>
+          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'"/>
+          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" label="One-Way" filter="&quot;status&quot; = 'one-way'"/>
+          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" label="Road Closures" filter="&quot;status&quot; = 'closure'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22283,50 +22278,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="2"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="2"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -22346,40 +22341,40 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@0" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="circle"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="0,255,0,255"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0.5"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="1"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="circle"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="0,255,0,255"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0.5"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="1"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -22402,52 +22397,52 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="2" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="2" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="2;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash dot dot"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="2;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash dot dot"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22478,41 +22473,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="25"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -22532,46 +22527,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@2@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@2@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,255,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3.5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -22594,58 +22589,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="3" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="3" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="3;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="0,255,0,255"/>
-                <Option type="QString" name="line_style" value="dash"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="3;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="0,255,0,255"/>
+                <Option name="line_style" type="QString" value="dash"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22676,41 +22671,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="250"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MapUnit"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="25"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MapUnit"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="Interval"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="250"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MapUnit"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="25"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MapUnit"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="Interval"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -22730,46 +22725,46 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="enabled">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="enabled" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@3@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@3@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="cap_style" value="square"/>
-                    <Option type="QString" name="color" value="0,255,0,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                    <Option type="QString" name="outline_style" value="solid"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="3.5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="cap_style" type="QString" value="square"/>
+                    <Option name="color" type="QString" value="0,255,0,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                    <Option name="outline_style" type="QString" value="solid"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="3.5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="square" k="cap_style"/>
@@ -22792,58 +22787,58 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="outlineStyle">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="outlineStyle" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="4" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="4" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="255,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.75"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="255,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.75"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -22874,20 +22869,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 type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="outlineColor">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="outlineStyle">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="outlineStyle" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -22896,32 +22891,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Regular" fontLetterSpacing="0" forcedBold="0" fontSize="9" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="times" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Regular" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="9" capitalization="0" fieldName="times" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -22936,116 +22931,116 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="4294967295" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="2" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="4294967295"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -23076,9 +23071,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23086,44 +23081,44 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -23132,40 +23127,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
-        <alias name="" field="status" index="2"/>
-        <alias name="" field="times" index="3"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="status" index="2" name=""/>
+        <alias field="times" index="3" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="status"/>
-        <default expression="" applyOnUpdate="0" field="times"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
+        <default field="status" expression="" applyOnUpdate="0"/>
+        <default field="times" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="status" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="times" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="status" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="times" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
-        <constraint exp="" field="status" desc=""/>
-        <constraint exp="" field="times" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="status" desc="" exp=""/>
+        <constraint field="times" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="type" hidden="0" width="202"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="status" hidden="0" width="-1"/>
-          <column type="field" name="times" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="type" type="field" width="202"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="status" type="field" width="-1"/>
+          <column hidden="0" name="times" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23197,10 +23192,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="status" editable="1"/>
-        <field name="times" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="status"/>
+        <field editable="1" name="times"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -23214,7 +23209,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="100000" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="100000" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37569522835420344</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -23279,7 +23274,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23304,58 +23299,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="225,89,137,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="225,89,137,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -23386,36 +23381,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="225,89,137,255" k="color"/>
@@ -23430,44 +23425,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="225,89,137,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="161,64,98,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="225,89,137,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="161,64,98,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -23490,54 +23485,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="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 key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}" 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; )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -23560,34 +23555,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -23602,138 +23597,138 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="3" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="3" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
+          <rule key="{1a82228c-f408-4c3d-bb8d-158713c47604}" description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="0,0,0,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="213,180,60,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="213,180,60,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -23756,34 +23751,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="0,0,0,255"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="1"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="0,0,0,255"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="1"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="0,0,0,255" k="color"/>
@@ -23798,131 +23793,131 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
-                          <Option type="Map" name="properties">
-                            <Option type="Map" name="fillColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                          <Option name="name" type="QString" value=""/>
+                          <Option name="properties" type="Map">
+                            <Option name="fillColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
-                            <Option type="Map" name="outlineColor">
-                              <Option type="bool" name="active" value="true"/>
-                              <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
-                              <Option type="int" name="type" value="3"/>
+                            <Option name="outlineColor" type="Map">
+                              <Option name="active" type="bool" value="true"/>
+                              <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END"/>
+                              <Option name="type" type="int" value="3"/>
                             </Option>
                           </Option>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="3" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="3" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="PositionX">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="PositionX" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PositionY">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="PositionY" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
-                    <Option type="Map" name="PredefinedPositionOrder">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="field" value="quadrant"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="PredefinedPositionOrder" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="field" type="QString" value="quadrant"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="Rotation">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="QString" name="field" value="rotation"/>
-                      <Option type="int" name="type" value="2"/>
+                    <Option name="Rotation" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="field" type="QString" value="rotation"/>
+                      <Option name="type" type="int" value="2"/>
                     </Option>
-                    <Option type="Map" name="ShapeBorderColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeBorderColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="ShapeFillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                    <Option name="ShapeFillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" active="0" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}">
-            <rule filter="&quot;Source&quot; = '21KM'" description="21KM" active="0" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}">
+          <rule key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}" active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule key="{69589abf-aba7-483e-bc24-1c579c8a7db2}" active="0" description="21KM" filter="&quot;Source&quot; = '21KM'">
               <settings calloutType="simple">
-                <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+                <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                  <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="210,32,39,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                    <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                  <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="210,32,39,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="210,32,39,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="210,32,39,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="210,32,39,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="210,32,39,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="210,32,39,255" k="color"/>
@@ -23937,130 +23932,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="3" geometryGeneratorType="PointGeometry" offsetType="0"/>
-                <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="3" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" description="10KM" active="0" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}">
+            <rule key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}" active="0" description="10KM" filter="&quot;Source&quot; = '10KM'">
               <settings calloutType="simple">
-                <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+                <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                  <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="103,34,144,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                    <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                  <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="103,34,144,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="103,34,144,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="103,34,144,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="103,34,144,255" k="color"/>
@@ -24075,130 +24070,130 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-                <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '5KM'" description="5KM" active="0" key="{693188a6-ae99-4fd2-859f-1606793dda66}">
+            <rule key="{693188a6-ae99-4fd2-859f-1606793dda66}" active="0" description="5KM" filter="&quot;Source&quot; = '5KM'">
               <settings calloutType="simple">
-                <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+                <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                  <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="128" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="145,211,55,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                    <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                  <background shapeSizeX="1" shapeJoinStyle="128" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="145,211,55,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="145,211,55,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="145,211,55,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="145,211,55,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="145,211,55,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="145,211,55,255" k="color"/>
@@ -24213,138 +24208,138 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
-                      <Option type="Map" name="properties">
-                        <Option type="Map" name="PositionX">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                      <Option name="name" type="QString" value=""/>
+                      <Option name="properties" type="Map">
+                        <Option name="PositionX" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PositionY">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="int" name="type" value="1"/>
-                          <Option type="QString" name="val" value=""/>
+                        <Option name="PositionY" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="type" type="int" value="1"/>
+                          <Option name="val" type="QString" value=""/>
                         </Option>
-                        <Option type="Map" name="PredefinedPositionOrder">
-                          <Option type="bool" name="active" value="true"/>
-                          <Option type="QString" name="field" value="quadrant"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="PredefinedPositionOrder" type="Map">
+                          <Option name="active" type="bool" value="true"/>
+                          <Option name="field" type="QString" value="quadrant"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
-                        <Option type="Map" name="Rotation">
-                          <Option type="bool" name="active" value="false"/>
-                          <Option type="QString" name="field" value="rotation"/>
-                          <Option type="int" name="type" value="2"/>
+                        <Option name="Rotation" type="Map">
+                          <Option name="active" type="bool" value="false"/>
+                          <Option name="field" type="QString" value="rotation"/>
+                          <Option name="type" type="int" value="2"/>
                         </Option>
                       </Option>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-                <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = 'Trail'" description="Trail" active="0" key="{ba58e108-c24a-410e-9584-a7819af049ef}">
+            <rule key="{ba58e108-c24a-410e-9584-a7819af049ef}" active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'">
               <settings calloutType="simple">
-                <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="255,255,255,255" legendString="Aa" fontItalic="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0" isExpression="1" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+                <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="255,255,255,255" fontSize="10" capitalization="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="1" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                  <background shapeType="0" shapeSizeType="0" shapeBorderWidth="1" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="145,211,55,255" shapeRadiiX="1" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                    <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <text-buffer bufferDraw="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                  <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                  <background shapeSizeX="1" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="145,211,55,255" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="1" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeOffsetUnit="MM">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                      <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="angle" value="0"/>
-                          <Option type="QString" name="cap_style" value="square"/>
-                          <Option type="QString" name="color" value="133,182,111,255"/>
-                          <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                          <Option type="QString" name="joinstyle" value="bevel"/>
-                          <Option type="QString" name="name" value="circle"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="0"/>
-                          <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="scale_method" value="diameter"/>
-                          <Option type="QString" name="size" value="2"/>
-                          <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="size_unit" value="MM"/>
-                          <Option type="QString" name="vertical_anchor_point" value="1"/>
+                          <Option name="angle" type="QString" value="0"/>
+                          <Option name="cap_style" type="QString" value="square"/>
+                          <Option name="color" type="QString" value="133,182,111,255"/>
+                          <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                          <Option name="joinstyle" type="QString" value="bevel"/>
+                          <Option name="name" type="QString" value="circle"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="0"/>
+                          <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="scale_method" type="QString" value="diameter"/>
+                          <Option name="size" type="QString" value="2"/>
+                          <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="size_unit" type="QString" value="MM"/>
+                          <Option name="vertical_anchor_point" type="QString" value="1"/>
                         </Option>
                         <prop v="0" k="angle"/>
                         <prop v="square" k="cap_style"/>
@@ -24367,34 +24362,34 @@ def my_form_open(dialog, layer, feature):
                         <prop v="1" k="vertical_anchor_point"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                    <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                         <Option type="Map">
-                          <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="color" value="0,72,255,255"/>
-                          <Option type="QString" name="joinstyle" value="round"/>
-                          <Option type="QString" name="offset" value="0,0"/>
-                          <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                          <Option type="QString" name="offset_unit" value="MM"/>
-                          <Option type="QString" name="outline_color" value="0,72,255,255"/>
-                          <Option type="QString" name="outline_style" value="solid"/>
-                          <Option type="QString" name="outline_width" value="1"/>
-                          <Option type="QString" name="outline_width_unit" value="MM"/>
-                          <Option type="QString" name="style" value="solid"/>
+                          <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="color" type="QString" value="0,72,255,255"/>
+                          <Option name="joinstyle" type="QString" value="round"/>
+                          <Option name="offset" type="QString" value="0,0"/>
+                          <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                          <Option name="offset_unit" type="QString" value="MM"/>
+                          <Option name="outline_color" type="QString" value="0,72,255,255"/>
+                          <Option name="outline_style" type="QString" value="solid"/>
+                          <Option name="outline_width" type="QString" value="1"/>
+                          <Option name="outline_width_unit" type="QString" value="MM"/>
+                          <Option name="style" type="QString" value="solid"/>
                         </Option>
                         <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                         <prop v="0,72,255,255" k="color"/>
@@ -24409,77 +24404,77 @@ def my_form_open(dialog, layer, feature):
                         <prop v="solid" k="style"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option type="QString" name="name" value=""/>
+                            <Option name="name" type="QString" value=""/>
                             <Option name="properties"/>
-                            <Option type="QString" name="type" value="collection"/>
+                            <Option name="type" type="QString" value="collection"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                  <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="0" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                <placement preserveRotation="1" repeatDistanceUnits="MM" priority="10" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" allowDegraded="1" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="6" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PointGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-20" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-                <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="2" zIndex="0" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+                <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="0" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+                <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-20" allowDegraded="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="2" placement="6" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="10" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="20" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PointGeometry" rotationUnit="AngleDegrees"/>
+                <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
-                    <Option type="Map" name="properties">
-                      <Option type="Map" name="PositionX">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                    <Option name="name" type="QString" value=""/>
+                    <Option name="properties" type="Map">
+                      <Option name="PositionX" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PositionY">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="int" name="type" value="1"/>
-                        <Option type="QString" name="val" value=""/>
+                      <Option name="PositionY" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="type" type="int" value="1"/>
+                        <Option name="val" type="QString" value=""/>
                       </Option>
-                      <Option type="Map" name="PredefinedPositionOrder">
-                        <Option type="bool" name="active" value="true"/>
-                        <Option type="QString" name="field" value="quadrant"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="PredefinedPositionOrder" type="Map">
+                        <Option name="active" type="bool" value="true"/>
+                        <Option name="field" type="QString" value="quadrant"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
-                      <Option type="Map" name="Rotation">
-                        <Option type="bool" name="active" value="false"/>
-                        <Option type="QString" name="field" value="rotation"/>
-                        <Option type="int" name="type" value="2"/>
+                      <Option name="Rotation" type="Map">
+                        <Option name="active" type="bool" value="false"/>
+                        <Option name="field" type="QString" value="rotation"/>
+                        <Option name="type" type="int" value="2"/>
                       </Option>
                     </Option>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                    <Option type="int" name="blendMode" value="0"/>
-                    <Option type="Map" name="ddProperties">
-                      <Option type="QString" name="name" value=""/>
+                    <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                    <Option name="blendMode" type="int" value="0"/>
+                    <Option name="ddProperties" type="Map">
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
-                    <Option type="bool" name="drawToAllParts" value="false"/>
-                    <Option type="QString" name="enabled" value="0"/>
-                    <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                    <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                    <Option type="double" name="minLength" value="0"/>
-                    <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="minLengthUnit" value="MM"/>
-                    <Option type="double" name="offsetFromAnchor" value="0"/>
-                    <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                    <Option type="double" name="offsetFromLabel" value="0"/>
-                    <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                    <Option name="drawToAllParts" type="bool" value="false"/>
+                    <Option name="enabled" type="QString" value="0"/>
+                    <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                    <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                    <Option name="minLength" type="double" value="0"/>
+                    <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="minLengthUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromAnchor" type="double" value="0"/>
+                    <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                    <Option name="offsetFromLabel" type="double" value="0"/>
+                    <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                   </Option>
                 </callout>
               </settings>
@@ -24489,62 +24484,62 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="no_action"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="no_action"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="100000" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="100000" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -24575,9 +24570,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24585,157 +24580,157 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="descriptio" configurationFlags="None">
+        <field configurationFlags="None" name="descriptio">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="timestamp" configurationFlags="None">
+        <field configurationFlags="None" name="timestamp">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="begin" configurationFlags="None">
+        <field configurationFlags="None" name="begin">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="end" configurationFlags="None">
+        <field configurationFlags="None" name="end">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Distance" configurationFlags="None">
+        <field configurationFlags="None" name="Distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="RouteLen" configurationFlags="None">
+        <field configurationFlags="None" name="RouteLen">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="None">
+        <field configurationFlags="None" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="length_m" configurationFlags="None">
+        <field configurationFlags="None" name="length_m">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="org_fid" configurationFlags="None">
+        <field configurationFlags="None" name="org_fid">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="distance" configurationFlags="None">
+        <field configurationFlags="None" name="distance">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="quadrant" configurationFlags="None">
+        <field configurationFlags="None" name="quadrant">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -24744,95 +24739,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Name" index="0"/>
-        <alias name="" field="descriptio" index="1"/>
-        <alias name="" field="timestamp" index="2"/>
-        <alias name="" field="begin" index="3"/>
-        <alias name="" field="end" index="4"/>
-        <alias name="" field="Distance" index="5"/>
-        <alias name="" field="RouteLen" index="6"/>
-        <alias name="" field="Source" index="7"/>
-        <alias name="" field="Sort" index="8"/>
-        <alias name="" field="day" index="9"/>
-        <alias name="" field="length_km" index="10"/>
-        <alias name="" field="length_m" index="11"/>
-        <alias name="" field="org_fid" index="12"/>
-        <alias name="" field="distance" index="13"/>
-        <alias name="" field="quadrant" index="14"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="Sort" index="8" name=""/>
+        <alias field="day" index="9" name=""/>
+        <alias field="length_km" index="10" name=""/>
+        <alias field="length_m" index="11" name=""/>
+        <alias field="org_fid" index="12" name=""/>
+        <alias field="distance" index="13" name=""/>
+        <alias field="quadrant" index="14" name=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="Sort" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="quadrant" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Distance" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Sort" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="distance" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="quadrant" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Sort" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="org_fid" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="quadrant" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="Name" desc=""/>
-        <constraint exp="" field="descriptio" desc=""/>
-        <constraint exp="" field="timestamp" desc=""/>
-        <constraint exp="" field="begin" desc=""/>
-        <constraint exp="" field="end" desc=""/>
-        <constraint exp="" field="Distance" desc=""/>
-        <constraint exp="" field="RouteLen" desc=""/>
-        <constraint exp="" field="Source" desc=""/>
-        <constraint exp="" field="Sort" desc=""/>
-        <constraint exp="" field="day" desc=""/>
-        <constraint exp="" field="length_km" desc=""/>
-        <constraint exp="" field="length_m" desc=""/>
-        <constraint exp="" field="org_fid" desc=""/>
-        <constraint exp="" field="distance" desc=""/>
-        <constraint exp="" field="quadrant" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="org_fid" hidden="0" width="-1"/>
-          <column type="field" name="distance" hidden="0" width="-1"/>
-          <column type="field" name="Name" hidden="0" width="-1"/>
-          <column type="field" name="Source" hidden="0" width="-1"/>
-          <column type="field" name="RouteLen" hidden="0" width="-1"/>
-          <column type="field" name="descriptio" hidden="0" width="-1"/>
-          <column type="field" name="timestamp" hidden="0" width="-1"/>
-          <column type="field" name="begin" hidden="0" width="-1"/>
-          <column type="field" name="end" hidden="0" width="-1"/>
-          <column type="field" name="Distance" hidden="0" width="-1"/>
-          <column type="field" name="length_km" hidden="0" width="-1"/>
-          <column type="field" name="Sort" hidden="0" width="-1"/>
-          <column type="field" name="quadrant" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="length_m" hidden="0" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="org_fid" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="-1"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="Distance" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column hidden="0" name="Sort" type="field" width="-1"/>
+          <column hidden="0" name="quadrant" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24864,21 +24859,21 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="quadrant"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -24898,28 +24893,28 @@ def my_form_open(dialog, layer, feature):
         <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 maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24992,58 +24987,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="229,182,54,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="229,182,54,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25074,36 +25069,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="229,182,54,255" k="color"/>
@@ -25118,44 +25113,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="229,182,54,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="164,130,39,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="229,182,54,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="164,130,39,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25178,38 +25173,38 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="singleSymbol">
         <symbols>
-          <symbol force_rhr="0" type="fill" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="114,155,111,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="114,155,111,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="114,155,111,255" k="color"/>
@@ -25224,9 +25219,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25237,39 +25232,39 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="&quot;id&quot;"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="&quot;id&quot;"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -25278,35 +25273,35 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="area" index="1"/>
-        <alias name="" field="rotation" index="2"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="area" index="1" name=""/>
+        <alias field="rotation" index="2" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="area"/>
-        <default expression="" applyOnUpdate="0" field="rotation"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="area" expression="" applyOnUpdate="0"/>
+        <default field="rotation" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="area" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="rotation" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="area" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="rotation" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="area" desc=""/>
-        <constraint exp="" field="rotation" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="area" desc="" exp=""/>
+        <constraint field="rotation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="area" hidden="0" width="-1"/>
-          <column type="field" name="rotation" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="area" type="field" width="-1"/>
+          <column hidden="0" name="rotation" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25329,7 +25324,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -25394,7 +25389,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -25419,58 +25414,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="196,60,57,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="196,60,57,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -25501,36 +25496,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="196,60,57,255" k="color"/>
@@ -25545,44 +25540,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="196,60,57,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="140,43,41,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="196,60,57,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="140,43,41,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25605,49 +25600,49 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule checkstate="0" label="All distances" symbol="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="marker" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="1" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="circle"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,0"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="0.5"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="circle"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,0"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="0.5"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -25670,20 +25665,20 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
-                  <Option type="Map" name="properties">
-                    <Option type="Map" name="fillColor">
-                      <Option type="bool" name="active" value="true"/>
-                      <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
-                      <Option type="int" name="type" value="3"/>
+                  <Option name="name" type="QString" value=""/>
+                  <Option name="properties" type="Map">
+                    <Option name="fillColor" type="Map">
+                      <Option name="active" type="bool" value="true"/>
+                      <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END"/>
+                      <Option name="type" type="int" value="3"/>
                     </Option>
-                    <Option type="Map" name="size">
-                      <Option type="bool" name="active" value="false"/>
-                      <Option type="int" name="type" value="1"/>
-                      <Option type="QString" name="val" value=""/>
+                    <Option name="size" type="Map">
+                      <Option name="active" type="bool" value="false"/>
+                      <Option name="type" type="int" value="1"/>
+                      <Option name="val" type="QString" value=""/>
                     </Option>
                   </Option>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -25695,64 +25690,64 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="StringList" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="StringList">
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -25783,9 +25778,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25793,116 +25788,116 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
+        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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/>
@@ -25911,85 +25906,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="Name" index="0"/>
-        <alias name="" field="descriptio" index="1"/>
-        <alias name="" field="timestamp" index="2"/>
-        <alias name="" field="begin" index="3"/>
-        <alias name="" field="end" index="4"/>
-        <alias name="" field="RouteLen" index="5"/>
-        <alias name="" field="Source" index="6"/>
-        <alias name="" field="length_m" index="7"/>
-        <alias name="" field="length_km" index="8"/>
-        <alias name="" field="org_fid" index="9"/>
-        <alias name="" field="distance" index="10"/>
-        <alias name="" field="first_runn" index="11"/>
-        <alias name="" field="last_runne" index="12"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default field="descriptio" expression="" applyOnUpdate="0"/>
+        <default field="timestamp" expression="" applyOnUpdate="0"/>
+        <default field="begin" expression="" applyOnUpdate="0"/>
+        <default field="end" expression="" applyOnUpdate="0"/>
+        <default field="RouteLen" expression="" applyOnUpdate="0"/>
+        <default field="Source" expression="" applyOnUpdate="0"/>
+        <default field="length_m" expression="" applyOnUpdate="0"/>
+        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default field="org_fid" expression="" applyOnUpdate="0"/>
+        <default field="distance" expression="" applyOnUpdate="0"/>
+        <default field="first_runn" expression="" applyOnUpdate="0"/>
+        <default field="last_runne" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="Name" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="descriptio" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="timestamp" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="begin" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="end" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="RouteLen" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="Source" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_m" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="length_km" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="org_fid" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="distance" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="first_runn" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="last_runne" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="org_fid" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="first_runn" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="last_runne" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="Name" desc=""/>
-        <constraint exp="" field="descriptio" desc=""/>
-        <constraint exp="" field="timestamp" desc=""/>
-        <constraint exp="" field="begin" desc=""/>
-        <constraint exp="" field="end" desc=""/>
-        <constraint exp="" field="RouteLen" desc=""/>
-        <constraint exp="" field="Source" desc=""/>
-        <constraint exp="" field="length_m" desc=""/>
-        <constraint exp="" field="length_km" desc=""/>
-        <constraint exp="" field="org_fid" desc=""/>
-        <constraint exp="" field="distance" desc=""/>
-        <constraint exp="" field="first_runn" desc=""/>
-        <constraint exp="" field="last_runne" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="begin" hidden="0" width="179"/>
-          <column type="field" name="RouteLen" hidden="0" width="-1"/>
-          <column type="field" name="Source" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="Name" hidden="0" width="-1"/>
-          <column type="field" name="length_m" hidden="0" width="-1"/>
-          <column type="field" name="length_km" hidden="0" width="-1"/>
-          <column type="field" name="org_fid" hidden="0" width="-1"/>
-          <column type="field" name="first_runn" hidden="0" width="-1"/>
-          <column type="field" name="last_runne" hidden="0" width="-1"/>
-          <column type="field" name="descriptio" hidden="0" width="-1"/>
-          <column type="field" name="timestamp" hidden="0" width="-1"/>
-          <column type="field" name="end" hidden="0" width="-1"/>
-          <column type="field" name="distance" hidden="0" width="-1"/>
+          <column hidden="0" name="begin" type="field" width="179"/>
+          <column hidden="0" name="RouteLen" type="field" width="-1"/>
+          <column hidden="0" name="Source" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="Name" type="field" width="-1"/>
+          <column hidden="0" name="length_m" type="field" width="-1"/>
+          <column hidden="0" name="length_km" type="field" width="-1"/>
+          <column hidden="0" name="org_fid" type="field" width="-1"/>
+          <column hidden="0" name="first_runn" type="field" width="-1"/>
+          <column hidden="0" name="last_runne" type="field" width="-1"/>
+          <column hidden="0" name="descriptio" type="field" width="-1"/>
+          <column hidden="0" name="timestamp" type="field" width="-1"/>
+          <column hidden="0" name="end" type="field" width="-1"/>
+          <column hidden="0" name="distance" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26021,31 +26016,31 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="display" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="distance_1" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="first_run" editable="1"/>
-        <field name="first_runn" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="first_runner_s" editable="1"/>
-        <field name="last_run" editable="0"/>
-        <field name="last_runn" editable="1"/>
-        <field name="last_runne" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="last_runner_s" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="display"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="distance_1"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="first_run"/>
+        <field editable="1" name="first_runn"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="first_runner_s"/>
+        <field editable="0" name="last_run"/>
+        <field editable="1" name="last_runn"/>
+        <field editable="1" name="last_runne"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="last_runner_s"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="Distance"/>
@@ -26080,7 +26075,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="0" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Line" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Line" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -26153,58 +26148,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="190,178,151,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="190,178,151,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26235,36 +26230,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="190,178,151,255" k="color"/>
@@ -26279,44 +26274,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="190,178,151,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="136,127,108,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="190,178,151,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="136,127,108,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -26339,58 +26334,58 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" referencescale="-1" symbollevels="0" enableorderby="0">
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" filter="&quot;type&quot; IS 'car'" symbol="0" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule label="Walking" filter="&quot;type&quot; IS 'walk'" symbol="1" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car" filter="&quot;type&quot; IS 'car'"/>
+          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol force_rhr="0" type="line" name="0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="0" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="123,211,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="123,211,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26421,50 +26416,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol force_rhr="0" type="line" name="1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="1" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="flat"/>
-                <Option type="QString" name="customdash" value="4;1;1;1"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="103,34,144,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="1.25"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="1"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="flat"/>
+                <Option name="customdash" type="QString" value="4;1;1;1"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="103,34,144,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="1.25"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="1"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="flat" k="capstyle"/>
@@ -26495,30 +26490,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer class="MarkerLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="average_angle_length" value="4"/>
-                <Option type="QString" name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="average_angle_unit" value="MM"/>
-                <Option type="QString" name="interval" value="3"/>
-                <Option type="QString" name="interval_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="interval_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_along_line" value="0"/>
-                <Option type="QString" name="offset_along_line_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_along_line_unit" value="MM"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="bool" name="place_on_every_part" value="true"/>
-                <Option type="QString" name="placements" value="LastVertex"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="rotate" value="1"/>
+                <Option name="average_angle_length" type="QString" value="4"/>
+                <Option name="average_angle_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="average_angle_unit" type="QString" value="MM"/>
+                <Option name="interval" type="QString" value="3"/>
+                <Option name="interval_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="interval_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_along_line" type="QString" value="0"/>
+                <Option name="offset_along_line_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_along_line_unit" type="QString" value="MM"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="place_on_every_part" type="bool" value="true"/>
+                <Option name="placements" type="QString" value="LastVertex"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="rotate" type="QString" value="1"/>
               </Option>
               <prop v="4" k="average_angle_length"/>
               <prop v="3x:0,0,0,0,0,0" k="average_angle_map_unit_scale"/>
@@ -26538,33 +26533,33 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="rotate"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <symbol force_rhr="0" type="marker" name="@1@1" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="@1@1" clip_to_extent="1" type="marker" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer class="FilledMarker" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="angle" value="0"/>
-                    <Option type="QString" name="color" value="103,34,144,255"/>
-                    <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                    <Option type="QString" name="name" value="filled_arrowhead"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="scale_method" value="diameter"/>
-                    <Option type="QString" name="size" value="5"/>
-                    <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="size_unit" value="MM"/>
-                    <Option type="QString" name="vertical_anchor_point" value="1"/>
+                    <Option name="angle" type="QString" value="0"/>
+                    <Option name="color" type="QString" value="103,34,144,255"/>
+                    <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                    <Option name="name" type="QString" value="filled_arrowhead"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="scale_method" type="QString" value="diameter"/>
+                    <Option name="size" type="QString" value="5"/>
+                    <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="size_unit" type="QString" value="MM"/>
+                    <Option name="vertical_anchor_point" type="QString" value="1"/>
                   </Option>
                   <prop v="0" k="angle"/>
                   <prop v="103,34,144,255" k="color"/>
@@ -26580,32 +26575,32 @@ def my_form_open(dialog, layer, feature):
                   <prop v="1" k="vertical_anchor_point"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol force_rhr="0" type="fill" name="@@1@1@0" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="@@1@1@0" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="103,34,144,255"/>
-                        <Option type="QString" name="joinstyle" value="miter"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="no"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="103,34,144,255"/>
+                        <Option name="joinstyle" type="QString" value="miter"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="no"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="103,34,144,255" k="color"/>
@@ -26620,9 +26615,9 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -26635,60 +26630,60 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="dualview/previewExpressions" value="id"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="QString" value="id"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -26719,9 +26714,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26729,30 +26724,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="2" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="2" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -26761,30 +26756,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="type" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="type" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="type" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="type" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="type" hidden="0" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="type" type="field" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26816,8 +26811,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -26829,7 +26824,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Point" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="0" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="0" symbologyReferenceScale="-1" minScale="100000000" geometry="Point" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="Point" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26902,58 +26897,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="145,82,45,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="145,82,45,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -26984,36 +26979,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="145,82,45,255" k="color"/>
@@ -27028,44 +27023,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="145,82,45,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="104,59,32,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="145,82,45,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="104,59,32,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -27088,44 +27083,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="0" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Semibold" fontLetterSpacing="0" forcedBold="0" fontSize="15" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" legendString="Aa" fontItalic="0" fieldName="label" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="Semibold" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="15" capitalization="0" fieldName="label" multilineHeight="1" useSubstitutions="0" textOpacity="1" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="1" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -27140,115 +27135,115 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="3" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-          <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="0" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="0" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="UnknownGeometry" lineAnchorClipping="0" centroidWhole="0" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0"/>
-          <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="1" zIndex="0" scaleMax="0" labelPerPart="0" scaleMin="0" maxNumLabels="2000" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+          <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="3"/>
+          <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MM" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="0" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="4" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="UnknownGeometry" rotationUnit="AngleDegrees"/>
+          <rendering fontMaxPixelSize="10000" maxNumLabels="2000" minFeatureSize="0" scaleVisibility="0" scaleMin="0" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" zIndex="0" fontLimitPixelSize="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-              <Option type="int" name="blendMode" value="0"/>
-              <Option type="Map" name="ddProperties">
-                <Option type="QString" name="name" value=""/>
+              <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+              <Option name="blendMode" type="int" value="0"/>
+              <Option name="ddProperties" type="Map">
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
-              <Option type="bool" name="drawToAllParts" value="false"/>
-              <Option type="QString" name="enabled" value="0"/>
-              <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-              <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-              <Option type="double" name="minLength" value="0"/>
-              <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="minLengthUnit" value="MM"/>
-              <Option type="double" name="offsetFromAnchor" value="0"/>
-              <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-              <Option type="double" name="offsetFromLabel" value="0"/>
-              <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+              <Option name="drawToAllParts" type="bool" value="false"/>
+              <Option name="enabled" type="QString" value="0"/>
+              <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+              <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+              <Option name="minLength" type="double" value="0"/>
+              <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="minLengthUnit" type="QString" value="MM"/>
+              <Option name="offsetFromAnchor" type="double" value="0"/>
+              <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+              <Option name="offsetFromLabel" type="double" value="0"/>
+              <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="0" strikethrough="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" italic="1"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="0" italic="1" underline="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -27279,9 +27274,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27289,30 +27284,30 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="18" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="18" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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/>
@@ -27321,30 +27316,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="label" index="1"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="label" index="1" name=""/>
       </aliases>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="label"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="label" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="field" name="label" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="0" name="label" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27376,8 +27371,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="id"/>
@@ -27389,7 +27384,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer maxScale="0" simplifyDrawingTol="1" type="vector" legendPlaceholderImage="" labelsEnabled="1" simplifyLocal="1" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" geometry="Polygon" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" minScale="100000000" simplifyDrawingHints="1" symbologyReferenceScale="-1" autoRefreshEnabled="0">
+    <maplayer readOnly="0" simplifyDrawingHints="1" symbologyReferenceScale="-1" minScale="100000000" geometry="Polygon" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" simplifyMaxScale="1" maxScale="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" type="vector" autoRefreshTime="0" simplifyDrawingTol="1" legendPlaceholderImage="">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -27454,7 +27449,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" crs="" miny="0" minz="0" maxx="0" dimensions="2" minx="0" maxz="0"/>
+          <spatial maxy="0" dimensions="2" minx="0" crs="" minz="0" miny="0" maxz="0" maxx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -27479,58 +27474,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal accumulate="0" endExpression="" startExpression="" startField="" limitMode="0" durationUnit="min" endField="" mode="0" durationField="" fixedDuration="0" enabled="0">
+      <temporal accumulate="0" endExpression="" enabled="0" startExpression="" endField="" startField="" limitMode="0" mode="0" fixedDuration="0" durationField="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" binding="Centroid" type="IndividualFeatures" extrusion="0" respectLayerSymbol="1" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0" zscale="1" clamping="Terrain" symbology="Line">
+      <elevation binding="Centroid" showMarkerSymbolInSurfacePlots="0" symbology="Line" zoffset="0" clamping="Terrain" extrusion="0" type="IndividualFeatures" extrusionEnabled="0" respectLayerSymbol="1" zscale="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="line_color" value="125,139,143,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.6"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="line_color" type="QString" value="125,139,143,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.6"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -27561,36 +27556,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="125,139,143,255" k="color"/>
@@ -27605,44 +27600,44 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="angle" value="0"/>
-                <Option type="QString" name="cap_style" value="square"/>
-                <Option type="QString" name="color" value="125,139,143,255"/>
-                <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="name" value="diamond"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="89,99,102,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.2"/>
-                <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="scale_method" value="diameter"/>
-                <Option type="QString" name="size" value="3"/>
-                <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="size_unit" value="MM"/>
-                <Option type="QString" name="vertical_anchor_point" value="1"/>
+                <Option name="angle" type="QString" value="0"/>
+                <Option name="cap_style" type="QString" value="square"/>
+                <Option name="color" type="QString" value="125,139,143,255"/>
+                <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="name" type="QString" value="diamond"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="89,99,102,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.2"/>
+                <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="scale_method" type="QString" value="diameter"/>
+                <Option name="size" type="QString" value="3"/>
+                <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="size_unit" type="QString" value="MM"/>
+                <Option name="vertical_anchor_point" type="QString" value="1"/>
               </Option>
               <prop v="0" k="angle"/>
               <prop v="square" k="cap_style"/>
@@ -27665,54 +27660,54 @@ def my_form_open(dialog, layer, feature):
               <prop v="1" k="vertical_anchor_point"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" referencescale="-1" symbollevels="0" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" referencescale="-1" symbollevels="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 key="{c438992b-4486-4e7d-a594-2c46fe177154}" 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">
             <settings calloutType="simple">
-              <text-style fontUnderline="0" textOpacity="0.90000000000000002" textOrientation="horizontal" fontWeight="75" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="Bold" fontLetterSpacing="0" forcedBold="0" fontSize="8" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="31,120,180,255" legendString="Aa" fontItalic="0" fieldName="label" useSubstitutions="0" isExpression="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+              <text-style namedStyle="Bold" fontKerning="1" forcedItalic="0" textColor="31,120,180,255" fontSize="8" capitalization="0" fieldName="label" multilineHeight="1" useSubstitutions="0" textOpacity="0.90000000000000002" fontWordSpacing="0" isExpression="0" fontSizeUnit="Point" textOrientation="horizontal" legendString="Aa" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="75" forcedBold="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferOpacity="0.40000000000000002" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="0" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="0.75"/>
-                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-                <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0.75" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="31,120,206,255" shapeRadiiX="0.5" shapeRadiiUnit="MM" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.29999999999999999" shapeRadiiY="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeBlendMode="0" shapeFillColor="255,255,255,204" shapeOpacity="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-                  <symbol force_rhr="0" type="marker" name="markerSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="0.75" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0"/>
+                <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+                <background shapeSizeX="0.75" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,204" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeBlendMode="0" shapeSizeY="0.29999999999999999" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0.5" shapeOpacity="0.59999999999999998" shapeRotation="0" shapeOffsetY="-0.14999999999999999" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeOffsetUnit="MM">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="markerSymbol" clip_to_extent="1" type="marker" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="angle" value="0"/>
-                        <Option type="QString" name="cap_style" value="square"/>
-                        <Option type="QString" name="color" value="196,60,57,255"/>
-                        <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                        <Option type="QString" name="joinstyle" value="bevel"/>
-                        <Option type="QString" name="name" value="circle"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0"/>
-                        <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="scale_method" value="diameter"/>
-                        <Option type="QString" name="size" value="2"/>
-                        <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="size_unit" value="MM"/>
-                        <Option type="QString" name="vertical_anchor_point" value="1"/>
+                        <Option name="angle" type="QString" value="0"/>
+                        <Option name="cap_style" type="QString" value="square"/>
+                        <Option name="color" type="QString" value="196,60,57,255"/>
+                        <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                        <Option name="joinstyle" type="QString" value="bevel"/>
+                        <Option name="name" type="QString" value="circle"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0"/>
+                        <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="scale_method" type="QString" value="diameter"/>
+                        <Option name="size" type="QString" value="2"/>
+                        <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="size_unit" type="QString" value="MM"/>
+                        <Option name="vertical_anchor_point" type="QString" value="1"/>
                       </Option>
                       <prop v="0" k="angle"/>
                       <prop v="square" k="cap_style"/>
@@ -27735,34 +27730,34 @@ def my_form_open(dialog, layer, feature):
                       <prop v="1" k="vertical_anchor_point"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+                  <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option type="QString" name="name" value=""/>
+                        <Option name="name" type="QString" value=""/>
                         <Option name="properties"/>
-                        <Option type="QString" name="type" value="collection"/>
+                        <Option name="type" type="QString" value="collection"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                       <Option type="Map">
-                        <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="color" value="255,255,255,204"/>
-                        <Option type="QString" name="joinstyle" value="round"/>
-                        <Option type="QString" name="offset" value="0,0"/>
-                        <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                        <Option type="QString" name="offset_unit" value="MM"/>
-                        <Option type="QString" name="outline_color" value="31,120,206,255"/>
-                        <Option type="QString" name="outline_style" value="solid"/>
-                        <Option type="QString" name="outline_width" value="0.75"/>
-                        <Option type="QString" name="outline_width_unit" value="MM"/>
-                        <Option type="QString" name="style" value="solid"/>
+                        <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="color" type="QString" value="255,255,255,204"/>
+                        <Option name="joinstyle" type="QString" value="round"/>
+                        <Option name="offset" type="QString" value="0,0"/>
+                        <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                        <Option name="offset_unit" type="QString" value="MM"/>
+                        <Option name="outline_color" type="QString" value="31,120,206,255"/>
+                        <Option name="outline_style" type="QString" value="solid"/>
+                        <Option name="outline_width" type="QString" value="0.75"/>
+                        <Option name="outline_width_unit" type="QString" value="MM"/>
+                        <Option name="style" type="QString" value="solid"/>
                       </Option>
                       <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                       <prop v="255,255,255,204" k="color"/>
@@ -27777,56 +27772,56 @@ def my_form_open(dialog, layer, feature):
                       <prop v="solid" k="style"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option type="QString" name="name" value=""/>
+                          <Option name="name" type="QString" value=""/>
                           <Option name="properties"/>
-                          <Option type="QString" name="type" value="collection"/>
+                          <Option name="type" type="QString" value="collection"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+                <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format autoWrapLength="0" placeDirectionSymbol="0" multilineAlign="1" decimals="3" plussign="0" rightDirectionSymbol=">" formatNumbers="0" wrapChar="" reverseDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" addDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-              <placement preserveRotation="1" repeatDistanceUnits="MM" priority="5" placementFlags="10" polygonPlacementFlags="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" allowDegraded="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" placement="0" geometryGenerator="" rotationUnit="AngleDegrees" centroidInside="0" xOffset="1" dist="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" rotationAngle="0" layerType="PolygonGeometry" lineAnchorClipping="0" centroidWhole="1" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" repeatDistance="0" overrunDistanceUnit="MM" lineAnchorType="0" offsetUnits="MapUnit" distMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" quadOffset="1" geometryGeneratorType="PointGeometry" offsetType="0"/>
-              <rendering drawLabels="1" unplacedVisibility="0" obstacleFactor="0.76000000000000001" zIndex="5" scaleMax="10000000" labelPerPart="0" scaleMin="1" maxNumLabels="6" scaleVisibility="0" limitNumLabels="0" minFeatureSize="0" fontLimitPixelSize="0" mergeLines="0" obstacleType="0" fontMaxPixelSize="10000" obstacle="1" upsidedownLabels="0" fontMinPixelSize="3"/>
+              <text-format autoWrapLength="0" leftDirectionSymbol="&lt;" decimals="3" formatNumbers="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" addDirectionSymbol="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" plussign="0" multilineAlign="1"/>
+              <placement predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" offsetUnits="MapUnit" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" preserveRotation="1" rotationAngle="0" centroidInside="0" maxCurvedCharAngleOut="-25" allowDegraded="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" dist="0" placement="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorType="0" priority="5" xOffset="1" geometryGenerator="" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" maxCurvedCharAngleIn="25" overrunDistanceUnit="MM" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" polygonPlacementFlags="2" overrunDistance="0" quadOffset="1" repeatDistance="0" fitInPolygonOnly="0" lineAnchorPercent="0.5" overlapHandling="PreventOverlap" lineAnchorClipping="0" geometryGeneratorEnabled="0" yOffset="0" offsetType="0" layerType="PolygonGeometry" rotationUnit="AngleDegrees"/>
+              <rendering fontMaxPixelSize="10000" maxNumLabels="6" minFeatureSize="0" scaleVisibility="0" scaleMin="1" labelPerPart="0" limitNumLabels="0" drawLabels="1" mergeLines="0" upsidedownLabels="0" obstacle="1" unplacedVisibility="0" obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" zIndex="5" fontLimitPixelSize="0" obstacleFactor="0.76000000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option type="QString" name="anchorPoint" value="pole_of_inaccessibility"/>
-                  <Option type="int" name="blendMode" value="0"/>
-                  <Option type="Map" name="ddProperties">
-                    <Option type="QString" name="name" value=""/>
+                  <Option name="anchorPoint" type="QString" value="pole_of_inaccessibility"/>
+                  <Option name="blendMode" type="int" value="0"/>
+                  <Option name="ddProperties" type="Map">
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
-                  <Option type="bool" name="drawToAllParts" value="false"/>
-                  <Option type="QString" name="enabled" value="0"/>
-                  <Option type="QString" name="labelAnchorPoint" value="point_on_exterior"/>
-                  <Option type="QString" name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; name=&quot;align_dash_pattern&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;capstyle&quot; value=&quot;square&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash&quot; value=&quot;5;2&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;customdash_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;joinstyle&quot; value=&quot;bevel&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_color&quot; value=&quot;60,60,60,255&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_style&quot; value=&quot;solid&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width&quot; value=&quot;0.3&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;line_width_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;offset_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;ring_filter&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;use_custom_dash&quot; value=&quot;0&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;prop 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 type=&quot;QString&quot; name=&quot;name&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; name=&quot;type&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
-                  <Option type="double" name="minLength" value="0"/>
-                  <Option type="QString" name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="minLengthUnit" value="MM"/>
-                  <Option type="double" name="offsetFromAnchor" value="0"/>
-                  <Option type="QString" name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromAnchorUnit" value="MM"/>
-                  <Option type="double" name="offsetFromLabel" value="0"/>
-                  <Option type="QString" name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offsetFromLabelUnit" value="MM"/>
+                  <Option name="drawToAllParts" type="bool" value="false"/>
+                  <Option name="enabled" type="QString" value="0"/>
+                  <Option name="labelAnchorPoint" type="QString" value="point_on_exterior"/>
+                  <Option name="lineSymbol" type="QString" value="&lt;symbol alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; is_animated=&quot;0&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; enabled=&quot;1&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;capstyle&quot; type=&quot;QString&quot; value=&quot;square&quot;/>&lt;Option name=&quot;customdash&quot; type=&quot;QString&quot; value=&quot;5;2&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;customdash_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;joinstyle&quot; type=&quot;QString&quot; value=&quot;bevel&quot;/>&lt;Option name=&quot;line_color&quot; type=&quot;QString&quot; value=&quot;60,60,60,255&quot;/>&lt;Option name=&quot;line_style&quot; type=&quot;QString&quot; value=&quot;solid&quot;/>&lt;Option name=&quot;line_width&quot; type=&quot;QString&quot; value=&quot;0.3&quot;/>&lt;Option name=&quot;line_width_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;offset&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;offset_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;ring_filter&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;trim_distance_start&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; type=&quot;QString&quot; value=&quot;MM&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;use_custom_dash&quot; type=&quot;QString&quot; value=&quot;0&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot;/>&lt;/Option>&lt;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; type=&quot;QString&quot; value=&quot;&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; type=&quot;QString&quot; value=&quot;collection&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>"/>
+                  <Option name="minLength" type="double" value="0"/>
+                  <Option name="minLengthMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="minLengthUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromAnchor" type="double" value="0"/>
+                  <Option name="offsetFromAnchorMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromAnchorUnit" type="QString" value="MM"/>
+                  <Option name="offsetFromLabel" type="double" value="0"/>
+                  <Option name="offsetFromLabelMapUnitScale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offsetFromLabelUnit" type="QString" value="MM"/>
                 </Option>
               </callout>
             </settings>
@@ -27835,66 +27830,66 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="QFieldSync/action" value="copy"/>
-          <Option type="QString" name="QFieldSync/cloud_action" value="offline"/>
-          <Option type="QString" name="QFieldSync/photo_naming" value="{}"/>
-          <Option type="List" name="dualview/previewExpressions">
+          <Option name="QFieldSync/action" type="QString" value="copy"/>
+          <Option name="QFieldSync/cloud_action" type="QString" value="offline"/>
+          <Option name="QFieldSync/photo_naming" type="QString" value="{}"/>
+          <Option name="dualview/previewExpressions" type="List">
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
             <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option type="QString" name="embeddedWidgets/count" value="0"/>
-          <Option type="invalid" name="variableNames"/>
-          <Option type="invalid" name="variableValues"/>
+          <Option name="embeddedWidgets/count" type="QString" value="0"/>
+          <Option name="variableNames" type="invalid"/>
+          <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" scaleBasedVisibility="0" enabled="0" sizeScale="3x:0,0,0,0,0,0" penAlpha="255" lineSizeType="MM" labelPlacementMethod="XHeight" penWidth="0" barWidth="5" spacing="0" minimumSize="0" backgroundAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" width="15" backgroundColor="#ffffff" diagramOrientation="Up" height="15" lineSizeScale="3x:0,0,0,0,0,0" direction="1" sizeType="MM" minScaleDenominator="0" rotationOffset="270" penColor="#000000" scaleDependency="Area" showAxis="0" maxScaleDenominator="1e+08" opacity="1">
-          <fontProperties style="" strikethrough="0" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
-          <attribute label="" field="" color="#000000" colorOpacity="1"/>
+        <DiagramCategory scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" rotationOffset="270" penWidth="0" direction="1" spacingUnitScale="3x:0,0,0,0,0,0" width="15" height="15" maxScaleDenominator="1e+08" opacity="1" scaleBasedVisibility="0" minimumSize="0" spacingUnit="MM" backgroundColor="#ffffff" labelPlacementMethod="XHeight" enabled="0" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" showAxis="0" minScaleDenominator="0" penColor="#000000" spacing="0" penAlpha="255" diagramOrientation="Up" backgroundAlpha="255" barWidth="5">
+          <fontProperties strikethrough="0" style="" italic="0" underline="0" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0"/>
+          <attribute color="#000000" colorOpacity="1" field="" label=""/>
           <axisSymbol>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="35,35,35,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0.26"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="35,35,35,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0.26"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -27925,9 +27920,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -27935,66 +27930,66 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings obstacle="0" zIndex="0" linePlacementFlags="2" showAll="1" priority="0" placement="0" dist="0">
+      <DiagramLayerSettings obstacle="0" placement="0" linePlacementFlags="2" zIndex="0" priority="0" showAll="1" dist="0">
         <properties>
           <Option type="Map">
-            <Option type="QString" name="name" value=""/>
+            <Option name="name" type="QString" value=""/>
             <Option name="properties"/>
-            <Option type="QString" name="type" value="collection"/>
+            <Option name="type" type="QString" value="collection"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
-          <Option type="Map" name="QgsGeometryGapCheck">
-            <Option type="double" name="allowedGapsBuffer" value="0"/>
-            <Option type="bool" name="allowedGapsEnabled" value="false"/>
-            <Option type="QString" name="allowedGapsLayer" value=""/>
+          <Option name="QgsGeometryGapCheck" type="Map">
+            <Option name="allowedGapsBuffer" type="double" value="0"/>
+            <Option name="allowedGapsEnabled" type="bool" value="false"/>
+            <Option name="allowedGapsLayer" type="QString" value=""/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <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 type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="table_set" configurationFlags="None">
+        <field configurationFlags="None" name="table_set">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </Option>
             </config>
           </editWidget>
         </field>
-        <field name="label" configurationFlags="None">
+        <field configurationFlags="None" name="label">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option type="QString" name="IsMultiline" value="0"/>
-                <Option type="QString" name="UseHtml" value="0"/>
+                <Option name="IsMultiline" type="QString" value="0"/>
+                <Option name="UseHtml" type="QString" value="0"/>
               </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/>
@@ -28003,45 +27998,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" field="id" index="0"/>
-        <alias name="" field="table_set" index="1"/>
-        <alias name="" field="label" index="2"/>
-        <alias name="" field="races" index="3"/>
-        <alias name="" field="day" index="4"/>
+        <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=""/>
       </aliases>
       <defaults>
-        <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"/>
+        <default field="id" expression="" applyOnUpdate="0"/>
+        <default field="table_set" expression="" applyOnUpdate="0"/>
+        <default field="label" expression="" applyOnUpdate="0"/>
+        <default field="races" expression="" applyOnUpdate="0"/>
+        <default field="day" expression="" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" unique_strength="0" field="id" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="table_set" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="label" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="races" exp_strength="0" constraints="0"/>
-        <constraint notnull_strength="0" unique_strength="0" field="day" exp_strength="0" constraints="0"/>
+        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="table_set" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="label" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="races" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint notnull_strength="0" field="day" unique_strength="0" constraints="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" field="id" desc=""/>
-        <constraint exp="" field="table_set" desc=""/>
-        <constraint exp="" field="label" desc=""/>
-        <constraint exp="" field="races" desc=""/>
-        <constraint exp="" field="day" desc=""/>
+        <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=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
+      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
         <columns>
-          <column type="field" name="id" hidden="0" width="-1"/>
-          <column type="actions" hidden="1" width="-1"/>
-          <column type="field" name="table_set" hidden="0" width="-1"/>
-          <column type="field" name="label" hidden="0" width="-1"/>
-          <column type="field" name="day" hidden="0" width="-1"/>
-          <column type="field" name="races" hidden="0" width="130"/>
+          <column hidden="0" name="id" type="field" width="-1"/>
+          <column hidden="1" type="actions" width="-1"/>
+          <column hidden="0" name="table_set" type="field" width="-1"/>
+          <column hidden="0" name="label" type="field" width="-1"/>
+          <column hidden="0" name="day" type="field" width="-1"/>
+          <column hidden="0" name="races" type="field" width="130"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -28073,11 +28068,11 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="day" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
         <field labelOnTop="0" name="day"/>
@@ -28087,11 +28082,11 @@ def my_form_open(dialog, layer, feature):
         <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/>
@@ -28294,7 +28289,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/Fencing</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal maps</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -28456,361 +28451,361 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option type="QString" name="name" value=""/>
+      <Option name="name" type="QString" value=""/>
       <Option name="properties"/>
-      <Option type="QString" name="type" value="collection"/>
+      <Option name="type" type="QString" value="collection"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer style="default" expanded="1" visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="0" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <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="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Cones" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Cones">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="Fencing" expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Fencing and Cones"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Fencing">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="Fencing" expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-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-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Fencing and Cones"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - inset">
+      <layer style="default" expanded="1" visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <layer style="Fencing" expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal map - main">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <layer style="Fencing" expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal plan" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal plan">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <layer style="Fencing" expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Routes">
+      <layer style="default" expanded="1" visible="0" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <layer style="Fencing" expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
         <checked-legend-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-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="0"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer style="default" expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1"/>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer style="default" expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" visible="1" id="water_tables20170921142016467"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <layer style="Fencing" expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <layer style="default" expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <expanded-group-nodes>
         <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
@@ -28839,31 +28834,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -28878,49 +28873,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -28935,9 +28930,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28945,15 +28940,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="5" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="19.9422,32,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="128.508,3.98741,mm" background="true" frame="true" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="bevel" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.1,mm" wrapChar="" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
-        <FrameColor green="128" blue="128" red="128" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="128.508,3.98741,mm" frame="true" resizeToContents="1" size="19.9422,32,mm" fontColor="#000000" zValue="5" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="bevel" lineSpacing="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" outlineWidthM="0.1,mm" wmsLegendWidth="50" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="128.508,3.98741,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="128" alpha="255" green="128" blue="128"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28961,37 +28956,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="1" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28999,62 +28994,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" blendMode="0" drawCanvasItems="false" followPresetName="Marshal map - inset" outlineWidthM="0.2,mm" keepLayerSet="false" position="98.7828,149.027,mm" positionLock="true" type="65639" size="56.5192,54.5647,mm" positionOnPage="98.7828,149.027,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="4" frame="true" mapRotation="0" itemRotation="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" isTemporal="0" excludeFromExports="0" id="Inset map" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="4" size="56.5192,54.5647,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" itemRotation="0" id="Inset map" position="98.7828,149.027,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" followPresetName="Marshal map - inset" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="98.7828,149.027,mm" outlineWidthM="0.2,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94188878914365404" xmin="18.41788569471234993" xmax="18.42218047871277165" ymin="-33.94603505205213878"/>
+        <Extent ymin="-33.91647297528887606" xmax="18.42437871848258268" ymax="-33.91232887817815111" xmin="18.42008617785988278"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -29085,44 +29080,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -29145,40 +29140,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -29193,29 +29188,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29223,28 +29218,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" position="3" show="1" blendMode="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0">
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <ComposerMapOverview inverted="0" position="3" centered="1" name="Overview 1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,65,170,127"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,102"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,65,170,127"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,102"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,65,170,127" k="color"/>
@@ -29259,9 +29254,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29269,9 +29264,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29279,69 +29274,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="false" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" drawCanvasItems="false" followPresetName="Marshal map - main" outlineWidthM="0.3,mm" keepLayerSet="false" position="3.53,6.0007,mm" positionLock="true" type="65639" size="142,187.018,mm" positionOnPage="3.53,6.0007,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="3" frame="false" mapRotation="0" itemRotation="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" isTemporal="0" excludeFromExports="0" id="Main map" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="false" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="3" size="142,187.018,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" itemRotation="0" id="Main map" position="3.53,6.0007,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" followPresetName="Marshal map - main" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94328520011277561" xmin="18.41951926258746752" xmax="18.42054691083765405" ymin="-33.94463864108302431"/>
+        <Extent ymin="-33.91507729373412161" xmax="18.4227460039006381" ymax="-33.91372455973290556" xmin="18.42171889244182736"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -29372,44 +29367,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -29432,40 +29427,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -29480,29 +29475,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29510,22 +29505,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="false" sectionY="0" sectionHeight="187.018" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" blendMode="0" outlineWidthM="0.3,mm" position="290.617,6.0007,mm" positionLock="true" type="65647" size="142.117,187.018,mm" positionOnPage="290.617,6.0007,mm" hidePageIfEmpty="0" visibility="1" groupUuid="" sectionX="0" frameJoinStyle="round" referencePoint="2" zValue="2" frame="false" itemRotation="0" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" hideBackgroundIfEmpty="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="119" blue="119" red="119" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="2" visibility="1" hideBackgroundIfEmpty="0" background="false" excludeFromExports="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" groupUuid="" zValue="2" sectionHeight="187.018" size="142.117,187.018,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hidePageIfEmpty="0" itemRotation="0" id="" position="290.617,6.0007,mm" sectionY="0" frameJoinStyle="round" opacity="1" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionLock="true" positionOnPage="290.617,6.0007,mm" outlineWidthM="0.3,mm" sectionX="0" frame="false" type="65647" blendMode="0">
+        <FrameColor red="119" alpha="255" green="119" blue="119"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29533,21 +29528,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="25.2491" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="246.665,178.41,mm" resizeMode="0" positionLock="true" type="65640" size="47.1065,27.6,mm" positionOnPage="246.665,178.41,mm" svgFillColor="255,255,255,255" anchorPoint="0" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="1" frame="false" mode="1" itemRotation="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureWidth="47.1065" mapUuid="" excludeFromExports="0" file="../GunRun2022_500.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_500.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="1" size="47.1065,27.6,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" itemRotation="0" id="" position="246.665,178.41,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" pictureHeight="25.2491" positionOnPage="246.665,178.41,mm" outlineWidthM="0.3,mm" pictureWidth="47.1065" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="0" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29555,14 +29550,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame url="" type="65648" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&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>" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" maxBreakDistance="12" contentMode="1" evaluateExpressions="true" useSmartBreaks="true" stylesheetEnabled="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame stylesheetEnabled="true" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" resizeMode="0" 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;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races &lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&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  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" contentMode="1" evaluateExpressions="true" maxBreakDistance="12" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" url="" 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 type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29572,53 +29567,60 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="jpg"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropMarginUnit" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="false"/>
-          <Option type="QString" name="resizeToContentsBottomMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsLeftMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsRightMargin" value="3.53"/>
-          <Option type="QString" name="resizeToContentsTopMargin" value="3.53"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <Option name="atlasRasterFormat" type="QString" value="jpg"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropMarginUnit" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~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"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="false"/>
+          <Option name="resizeToContentsBottomMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsLeftMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsRightMargin" type="QString" value="3.53"/>
+          <Option name="resizeToContentsTopMargin" type="QString" value="3.53"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortKey="&quot;id&quot;" pageNameExpression="&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" sortAscending="1" sortFeatures="1" coverageLayerName="marshal_positions" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" enabled="1" hideCoverage="0" coverageLayerName="marshal_positions" sortKey="&quot;id&quot;" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortAscending="1" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -29633,49 +29635,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -29690,9 +29692,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29700,21 +29702,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem background="false" pictureRotation="330" pictureHeight="7.97477" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="286.027,2,mm" resizeMode="0" positionLock="true" type="65640" size="9.45865,11,mm" positionOnPage="286.027,2,mm" svgFillColor="255,255,255,255" anchorPoint="0" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="0" itemRotation="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureWidth="6.31767" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" file="arrows/NorthArrow_11.svg" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="arrows/NorthArrow_11.svg" mode="0" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="9.45865,11,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" itemRotation="0" id="" position="286.027,2,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" pictureHeight="7.97477" positionOnPage="286.027,2,mm" outlineWidthM="0.3,mm" pictureWidth="6.31767" pictureRotation="330" frame="false" type="65640" blendMode="0" anchorPoint="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29722,47 +29724,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" blendMode="0" outlineWidthM="0.3,mm" position="285.027,205.886,mm" positionLock="true" type="65641" size="142.543,10.3185,mm" positionOnPage="285.027,205.886,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" labelText="[%upper( &quot;area&quot; )%]" itemRotation="270" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" marginX="1" size="142.543,10.3185,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginY="1" itemRotation="270" id="" position="285.027,205.886,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" halign="1" positionLock="true" htmlState="0" positionOnPage="285.027,205.886,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="[%upper( &quot;area&quot; )%]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29777,65 +29779,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem unitType="meters" type="65646" groupUuid="" labelHorizontalPlacement="0" numSegments="4" labelVerticalPlacement="0" zValue="2" numUnitsPerSegment="100" lineCapStyle="square" itemRotation="0" labelBarSpace="3" size="145.54,16.2165,mm" referencePoint="0" numSegmentsLeft="2" segmentMillimeters="26.3519" positionLock="true" style="Single Box" blendMode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitLabel="m" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numMapUnitsPerScaleBarUnit="1" position="7,189.669,mm" numSubdivisions="1" background="false" minBarWidth="50" frame="false" lineJoinStyle="miter" visibility="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" maxBarWidth="150" subdivisionsHeight="1.5" alignment="0" segmentSizeMode="1" id="" frameJoinStyle="miter" outlineWidth="0.3" height="3" boxContentSpace="1" outlineWidthM="0.3,mm" positionOnPage="7,189.669,mm" excludeFromExports="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem unitType="meters" subdivisionsHeight="1.5" positionOnPage="7,189.669,mm" frame="false" size="145.54,16.2165,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" labelVerticalPlacement="0" numSegmentsLeft="2" zValue="2" itemRotation="0" positionLock="true" numMapUnitsPerScaleBarUnit="1" labelHorizontalPlacement="0" frameJoinStyle="miter" labelBarSpace="3" visibility="1" maxBarWidth="150" outlineWidthM="0.3,mm" height="3" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" boxContentSpace="1" referencePoint="0" opacity="1" groupUuid="" numSegments="4" numSubdivisions="1" outlineWidth="0.3" excludeFromExports="0" position="7,189.669,mm" lineCapStyle="square" unitLabel="m" id="" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" blendMode="0" lineJoinStyle="miter" segmentSizeMode="1" alignment="0" numUnitsPerSegment="100" background="false" minBarWidth="50" type="65646" style="Single Box" segmentMillimeters="26.3519">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -29850,75 +29852,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" red="0" alpha="255"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <Option name="decimal_separator" type="QChar" value=""/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="QChar" value=""/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" red="0" alpha="255"/>
-        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -29949,52 +29951,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30025,52 +30027,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.3"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.3"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -30101,36 +30103,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -30145,36 +30147,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -30189,87 +30191,87 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem background="false" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" blendMode="0" drawCanvasItems="false" followPresetName="Start/Finish" outlineWidthM="0.3,mm" keepLayerSet="false" position="7,5.5,mm" positionLock="true" type="65639" size="278.027,180.318,mm" positionOnPage="7,5.5,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="330" itemRotation="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="330" background="false" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="278.027,180.318,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" itemRotation="0" id="" position="7,5.5,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" followPresetName="Start/Finish" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="7,5.5,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="field" value="rotation"/>
-                  <Option type="int" name="type" value="2"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="field" type="QString" value="rotation"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="id"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="id"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" xmax="18.41790915398017958" ymin="-33.90494830469008747"/>
+        <Extent ymin="-33.90494830469008747" xmax="18.41790915398017958" ymax="-33.89880140828828559" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" leftAnnotationDisplay="3" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="1" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="5" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="4" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridStyle="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="5" topAnnotationDisplay="3" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="4" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="5" topAnnotationDisplay="3" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationDirection="0" blendMode="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedTicksEnabled="0" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="3" intervalY="5" leftFrameDivisions="0" unit="1" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -30300,44 +30302,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -30360,9 +30362,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30379,32 +30381,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -30419,29 +30421,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30449,65 +30451,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
-          <Option type="QString" name="svgCropMarginBottom" value="0"/>
-          <Option type="QString" name="svgCropMarginLeft" value="0"/>
-          <Option type="QString" name="svgCropMarginRight" value="0"/>
-          <Option type="QString" name="svgCropMarginTop" value="0"/>
-          <Option type="QString" name="svgCropToContents" value="true"/>
-          <Option type="QString" name="svgDisableRasterTiles" value="0"/>
-          <Option type="QString" name="svgGroupLayers" value="false"/>
-          <Option type="QString" name="svgIncludeMetadata" value="1"/>
-          <Option type="QString" name="svgTextFormat" value="0"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
+          <Option name="svgCropMarginBottom" type="QString" value="0"/>
+          <Option name="svgCropMarginLeft" type="QString" value="0"/>
+          <Option name="svgCropMarginRight" type="QString" value="0"/>
+          <Option name="svgCropMarginTop" type="QString" value="0"/>
+          <Option name="svgCropToContents" type="QString" value="true"/>
+          <Option name="svgDisableRasterTiles" type="QString" value="0"/>
+          <Option name="svgGroupLayers" type="QString" value="false"/>
+          <Option name="svgIncludeMetadata" type="QString" value="1"/>
+          <Option name="svgTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" sortKey="area" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="start_finish_area" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" enabled="1" hideCoverage="1" coverageLayerName="start_finish_area" sortKey="area" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;"/>
     </Layout>
-    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -30522,49 +30524,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -30579,9 +30581,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30589,15 +30591,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="11" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="38.1563,67.2879,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="256.808,5.21277,mm" background="true" frame="true" resizeToContents="0" visibility="1" legendFilterByAtlas="0" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="256.808,5.21277,mm" frame="true" resizeToContents="0" size="38.1563,67.2879,mm" fontColor="#000000" zValue="11" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="256.808,5.21277,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30605,53 +30607,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="Bold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="Bold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="fencing" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option type="QString" name="legend/expressionFilter" value=""/>
-                  <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30659,47 +30661,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" positionLock="true" type="65641" size="148.46,6.45211,mm" positionOnPage="6.76779,191.188,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="10" frame="false" labelText="FENCING: [% &quot;name&quot; %]" itemRotation="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="10" marginX="0" size="148.46,6.45211,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginY="0" itemRotation="0" id="" position="6.76779,191.188,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" halign="1" positionLock="true" htmlState="0" positionOnPage="6.76779,191.188,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="FENCING: [% &quot;name&quot; %]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30714,65 +30716,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" blendMode="0" outlineWidthM="0.3,mm" position="182.723,191.188,mm" positionLock="true" type="65641" size="56.3557,6.45237,mm" positionOnPage="182.723,191.188,mm" marginY="0" visibility="1" htmlState="1" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="9" frame="false" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" itemRotation="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="9" marginX="0" size="56.3557,6.45237,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginY="0" itemRotation="0" id="" position="182.723,191.188,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" halign="2" positionLock="true" htmlState="1" positionOnPage="182.723,191.188,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30787,65 +30789,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" blendMode="0" outlineWidthM="0.3,mm" position="209.146,198.083,mm" positionLock="true" type="65641" size="26.8205,6.82826,mm" positionOnPage="209.146,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="REVISION 2.1" itemRotation="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="26.8205,6.82826,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginY="0" itemRotation="0" id="" position="209.146,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" halign="2" positionLock="true" htmlState="0" positionOnPage="209.146,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 2.1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30860,65 +30862,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" blendMode="0" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" positionLock="true" type="65641" size="51.1638,7.07327,mm" positionOnPage="62.6706,198.083,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="7" frame="false" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="7" marginX="1" size="51.1638,7.07327,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginY="1" itemRotation="0" id="" position="62.6706,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" halign="1" positionLock="true" htmlState="0" positionOnPage="62.6706,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -30933,65 +30935,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" blendMode="0" outlineWidthM="0.3,mm" position="116.805,198.083,mm" positionLock="true" type="65641" size="64.7594,7.10512,mm" positionOnPage="116.805,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="0" size="64.7594,7.10512,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginY="0" itemRotation="0" id="" position="116.805,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" halign="1" positionLock="true" htmlState="0" positionOnPage="116.805,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31006,65 +31008,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" positionLock="true" type="65641" size="52.7903,7.07327,mm" positionOnPage="6.76779,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="0" size="52.7903,7.07327,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginY="0" itemRotation="0" id="" position="6.76779,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" halign="1" positionLock="true" htmlState="0" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Page [% @atlas_featurenumber %]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31079,39 +31081,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="26.4325" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="243.098,175.353,mm" resizeMode="0" positionLock="true" type="65640" size="49.3143,29.8354,mm" positionOnPage="243.098,175.353,mm" svgFillColor="255,255,255,255" anchorPoint="8" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="1" itemRotation="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureWidth="49.3143" mapUuid="" excludeFromExports="0" file="../GunRun2022_250.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_250.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="49.3143,29.8354,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" itemRotation="0" id="" position="243.098,175.353,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" pictureHeight="26.4325" positionOnPage="243.098,175.353,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="8" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31119,42 +31121,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" blendMode="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" positionLock="true" type="65643" size="232.01,0.14328,mm" positionOnPage="6.91779,197.79,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" itemRotation="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" itemRotation="0" id="" position="6.91779,197.79,mm" frameJoinStyle="miter" opacity="1" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" shapeType="1" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -31169,55 +31171,55 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem unitType="meters" type="65646" groupUuid="" labelHorizontalPlacement="0" numSegments="2" labelVerticalPlacement="0" zValue="2" numUnitsPerSegment="10" lineCapStyle="square" itemRotation="0" labelBarSpace="1" size="98.3387,15.8378,mm" referencePoint="0" numSegmentsLeft="2" segmentMillimeters="29.5258" positionLock="true" style="Double Box" blendMode="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" numSubdivisions="1" background="false" minBarWidth="25" frame="false" lineJoinStyle="round" visibility="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" maxBarWidth="100" subdivisionsHeight="1.5" alignment="0" segmentSizeMode="1" id="" frameJoinStyle="miter" outlineWidth="0.2" height="2" boxContentSpace="0.2" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem unitType="meters" subdivisionsHeight="1.5" positionOnPage="6.76779,2.8482,mm" frame="false" size="98.3387,15.8378,mm" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" labelVerticalPlacement="0" numSegmentsLeft="2" zValue="2" itemRotation="0" positionLock="true" numMapUnitsPerScaleBarUnit="1" labelHorizontalPlacement="0" frameJoinStyle="miter" labelBarSpace="1" visibility="1" maxBarWidth="100" outlineWidthM="0.3,mm" height="2" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" boxContentSpace="0.2" referencePoint="0" opacity="1" groupUuid="" numSegments="2" numSubdivisions="1" outlineWidth="0.2" excludeFromExports="0" position="6.76779,2.8482,mm" lineCapStyle="square" unitLabel="m" id="" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" lineJoinStyle="round" segmentSizeMode="1" alignment="0" numUnitsPerSegment="10" background="false" minBarWidth="25" type="65646" style="Double Box" segmentMillimeters="29.5258">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -31232,75 +31234,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" red="0" alpha="255"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <Option name="decimal_separator" type="QChar" value=""/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="QChar" value=""/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" red="0" alpha="255"/>
-        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -31331,52 +31333,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -31407,52 +31409,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -31483,36 +31485,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -31527,36 +31529,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31571,53 +31573,53 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem background="false" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" blendMode="0" drawCanvasItems="false" followPresetName="Fencing" outlineWidthM="0.3,mm" keepLayerSet="false" position="6.76779,9.35102,mm" positionLock="true" type="65639" size="283.418,180.92,mm" positionOnPage="6.76779,9.35102,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" isTemporal="0" excludeFromExports="0" id="" opacity="0.9">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="false" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="283.418,180.92,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" itemRotation="0" id="" position="6.76779,9.35102,mm" isTemporal="0" frameJoinStyle="miter" opacity="0.9" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" followPresetName="Fencing" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" name="exponent" value="1"/>
-                      <Option type="double" name="maxOutput" value="360"/>
-                      <Option type="double" name="maxValue" value="0"/>
-                      <Option type="double" name="minOutput" value="0"/>
-                      <Option type="double" name="minValue" value="0"/>
-                      <Option type="double" name="nullOutput" value="0"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option type="int" name="t" value="0"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option type="int" name="type" value="3"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91773520642930606" xmin="18.38521625771440782" xmax="18.38607854950289422" ymin="-33.91828564989084072"/>
+        <Extent ymin="-33.91828564989084072" xmax="18.38607854950289422" ymax="-33.91773520642930606" xmin="18.38521625771440782"/>
         <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>
@@ -31632,45 +31634,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" leftAnnotationDisplay="3" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="1" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="5" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="4" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridStyle="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="5" topAnnotationDisplay="3" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="4" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="5" topAnnotationDisplay="3" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationDirection="0" blendMode="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedTicksEnabled="0" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="3" intervalY="5" leftFrameDivisions="0" unit="1" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -31701,44 +31703,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -31761,9 +31763,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31780,32 +31782,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -31820,29 +31822,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31850,65 +31852,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="true"/>
-          <Option type="bool" name="singleFile" value="true"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas 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" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="fence_and_cone_groups" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="virtual" filterFeatures="0" 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" enabled="1" hideCoverage="1" coverageLayerName="fence_and_cone_groups" sortKey="&quot;group&quot;" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;"/>
     </Layout>
-    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="9" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="9"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -31923,49 +31925,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -31980,9 +31982,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -31992,47 +31994,47 @@ def my_form_open(dialog, layer, feature):
           <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" valign="64" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" blendMode="0" outlineWidthM="0.3,mm" position="4.43449,186.634,mm" positionLock="false" type="65641" size="83.9998,10.4638,mm" positionOnPage="4.43449,186.634,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="Directions to Start of Race" itemRotation="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="1" size="83.9998,10.4638,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginY="1" itemRotation="0" id="" position="4.43449,186.634,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" halign="1" positionLock="false" htmlState="0" positionOnPage="4.43449,186.634,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Directions to Start of Race">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="14" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="14" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32047,65 +32049,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" blendMode="0" outlineWidthM="0.3,mm" position="4.43449,197.498,mm" positionLock="false" type="65641" size="48.2923,9.511,mm" positionOnPage="4.43449,197.498,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="7" frame="false" labelText="Gun Run" itemRotation="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="7" marginX="1" size="48.2923,9.511,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginY="1" itemRotation="0" id="" position="4.43449,197.498,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" halign="1" positionLock="false" htmlState="0" positionOnPage="4.43449,197.498,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Gun Run">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32120,33 +32122,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem splitLayer="0" lineSpacing="2" type="65642" groupUuid="" equalColumnWidth="0" zValue="6" maxSymbolSize="0" itemRotation="0" symbolWidth="9" size="59.0766,76,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="false" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorderColor="0,0,0,255" title="" symbolHeight="5" position="10.096,10.8563,mm" background="true" frame="true" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" legendFilterByMap="1" frameJoinStyle="round" columnSpace="0" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-        <FrameColor green="139" blue="139" red="139" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="10.096,10.8563,mm" frame="true" resizeToContents="1" size="59.0766,76,mm" fontColor="#000000" zValue="6" wrapChar="" splitLayer="0" itemRotation="0" positionLock="false" frameJoinStyle="round" lineSpacing="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" minSymbolSize="0" symbolHeight="5" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" legendFilterByMap="1" excludeFromExports="0" position="10.096,10.8563,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="9" id="" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="0" maxSymbolSize="0" columnSpace="0" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="139" alpha="255" green="139" blue="139"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32154,52 +32156,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="3" alignment="1" marginTop="2.5">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" marginLeft="3" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Ask Me" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Ask Me" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option type="QString" name="legend/title-style" value="hidden"/>
+                <Option name="legend/title-style" type="QString" value="hidden"/>
               </Option>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="poi_labels" expanded="1" source="./poi_labels.shp|layername=poi_labels" legend_exp="" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/label-0" value="Start/Finish"/>
-                  <Option type="QString" name="legend/label-1" value="Toilets"/>
-                  <Option type="QString" name="legend/label-2" value="Tog Bag Drop-off"/>
-                  <Option type="QString" name="legend/label-3" value="Road Closed to Cars"/>
-                  <Option type="QString" name="legend/label-4" value="MyCiti Drop-off"/>
-                  <Option type="QString" name="legend/label-5" value="Parking"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="legend/label-0" type="QString" value="Start/Finish"/>
+                  <Option name="legend/label-1" type="QString" value="Toilets"/>
+                  <Option name="legend/label-2" type="QString" value="Tog Bag Drop-off"/>
+                  <Option name="legend/label-3" type="QString" value="Road Closed to Cars"/>
+                  <Option name="legend/label-4" type="QString" value="MyCiti Drop-off"/>
+                  <Option name="legend/label-5" type="QString" value="Parking"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="directions_to_start" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="legend/label-0" value="To 21KM Start (06:30)"/>
-                  <Option type="QString" name="legend/label-1" value="To 10KM Start (07:30)"/>
-                  <Option type="QString" name="legend/label-2" value="To 5KM Start (08:30)"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="legend/label-0" type="QString" value="To 21KM Start (06:30)"/>
+                  <Option name="legend/label-1" type="QString" value="To 10KM Start (07:30)"/>
+                  <Option name="legend/label-2" type="QString" value="To 5KM Start (08:30)"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32207,47 +32209,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" blendMode="0" outlineWidthM="0.3,mm" position="221.862,190.027,mm" positionLock="false" type="65641" size="27.7839,6.871,mm" positionOnPage="221.862,190.027,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="REVISION 1.0" itemRotation="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="1" size="27.7839,6.871,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginY="1" itemRotation="0" id="" position="221.862,190.027,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" halign="2" positionLock="false" htmlState="0" positionOnPage="221.862,190.027,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 1.0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32262,65 +32264,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" blendMode="0" outlineWidthM="0.3,mm" position="197.975,197.498,mm" positionLock="false" type="65641" size="51.6706,6.60801,mm" positionOnPage="197.975,197.498,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" labelText="Sunday, 20 October 2019" itemRotation="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="4" marginX="1" size="51.6706,6.60801,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginY="1" itemRotation="0" id="" position="197.975,197.498,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" halign="2" positionLock="false" htmlState="0" positionOnPage="197.975,197.498,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Sunday, 20 October 2019">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32335,39 +32337,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="24.3824" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="249.646,179.724,mm" resizeMode="0" positionLock="false" type="65640" size="42.9838,24.3824,mm" positionOnPage="249.646,179.724,mm" svgFillColor="255,255,255,255" anchorPoint="4" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" mode="1" itemRotation="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureWidth="24.2337" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" file="../Gun_Run_Logo.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../Gun_Run_Logo.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="3" size="42.9838,24.3824,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" itemRotation="0" id="" position="249.646,179.724,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" pictureHeight="24.3824" positionOnPage="249.646,179.724,mm" outlineWidthM="0.3,mm" pictureWidth="24.2337" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="4" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32375,42 +32377,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" blendMode="0" outlineWidthM="0.3,mm" position="4.58449,197.248,mm" positionLock="false" type="65643" size="244.912,0.1,mm" positionOnPage="4.58449,197.248,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="2" frame="false" itemRotation="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="2" cornerRadiusMeasure="0,mm" size="244.912,0.1,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" itemRotation="0" id="" position="4.58449,197.248,mm" frameJoinStyle="miter" opacity="1" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" shapeType="1" positionOnPage="4.58449,197.248,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -32425,46 +32427,46 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" blendMode="0" drawCanvasItems="false" followPresetName="Ask Me" outlineWidthM="0.3,mm" keepLayerSet="false" position="4.43449,6.411,mm" positionLock="false" type="65639" size="288.007,183.616,mm" positionOnPage="4.43449,6.411,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="288.007,183.616,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" itemRotation="0" id="" position="4.43449,6.411,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" followPresetName="Ask Me" followPreset="true" positionLock="false" labelMargin="0,mm" positionOnPage="4.43449,6.411,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" xmax="18.41789384089274151" ymin="-33.90994364588821952"/>
+        <Extent ymin="-33.90994364588821952" xmax="18.41789384089274151" ymax="-33.8970204297764468" 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>
@@ -32479,45 +32481,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -32548,44 +32550,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -32608,40 +32610,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -32656,29 +32658,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32686,56 +32688,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" coverageLayer="" hideCoverage="0" sortFeatures="0" filterFeatures="0" enabled="0"/>
+      <Atlas filterFeatures="0" enabled="0" hideCoverage="0" sortFeatures="0" coverageLayer="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression=""/>
     </Layout>
-    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -32750,49 +32752,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -32807,9 +32809,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32819,47 +32821,47 @@ def my_form_open(dialog, layer, feature):
           <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" valign="32" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" blendMode="0" outlineWidthM="0.3,mm" position="200.171,199.082,mm" positionLock="true" type="65641" size="61.5373,6.8714,mm" positionOnPage="200.171,199.082,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="13" frame="false" labelText="REVISION 3.2" itemRotation="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="13" marginX="0" size="61.5373,6.8714,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginY="0" itemRotation="0" id="" position="200.171,199.082,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" halign="2" positionLock="true" htmlState="0" positionOnPage="200.171,199.082,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 3.2">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32874,65 +32876,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" blendMode="0" outlineWidthM="0.3,mm" position="9.7863,192.073,mm" positionLock="true" type="65641" size="61.5373,6.60801,mm" positionOnPage="9.7863,192.073,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="12" frame="false" labelText="Gun Run 2022: [%&quot;Source&quot;%]" itemRotation="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="12" marginX="0" size="61.5373,6.60801,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginY="0" itemRotation="0" id="" position="9.7863,192.073,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" halign="1" positionLock="true" htmlState="0" positionOnPage="9.7863,192.073,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -32947,65 +32949,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" blendMode="0" outlineWidthM="0.3,mm" position="9.7863,199.082,mm" positionLock="true" type="65641" size="61.5373,6.60801,mm" positionOnPage="9.7863,199.082,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="11" frame="false" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" itemRotation="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="11" marginX="0" size="61.5373,6.60801,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginY="0" itemRotation="0" id="" position="9.7863,199.082,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" halign="1" positionLock="true" htmlState="0" positionOnPage="9.7863,199.082,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33020,39 +33022,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="15.9472" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="262.196,188.218,mm" resizeMode="0" positionLock="true" type="65640" size="29.7523,17.4718,mm" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255" anchorPoint="4" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="10" frame="false" mode="1" itemRotation="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureWidth="29.7523" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" file="../GunRun2022_250.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_250.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="10" size="29.7523,17.4718,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" itemRotation="0" id="" position="262.196,188.218,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" pictureHeight="15.9472" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="29.7523" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="4" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33060,42 +33062,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" blendMode="0" outlineWidthM="0.3,mm" position="9.57644,198.832,mm" positionLock="true" type="65643" size="251.982,0.1,mm" positionOnPage="9.57644,198.832,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="9" frame="false" itemRotation="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="9" cornerRadiusMeasure="0,mm" size="251.982,0.1,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" itemRotation="0" id="" position="9.57644,198.832,mm" frameJoinStyle="miter" opacity="1" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" shapeType="1" positionOnPage="9.57644,198.832,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -33110,321 +33112,321 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="9.57644,5.42566,mm" positionLock="true" type="65639" size="107.861,186.385,mm" positionOnPage="9.57644,5.42566,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="8" frame="true" mapRotation="0" itemRotation="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" isTemporal="0" excludeFromExports="0" id="Trail Finish" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="8" size="107.861,186.385,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" itemRotation="0" id="Trail Finish" position="9.57644,5.42566,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="9.57644,5.42566,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" xmax="18.41187375074135701" ymin="-33.93243205975926458"/>
+        <Extent ymin="-33.93243205975926458" xmax="18.41187375074135701" ymax="-33.90007566747966905" xmin="18.39314911415855391"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="112.643,4.09761,mm" positionLock="true" type="65639" size="179.156,189.279,mm" positionOnPage="112.643,4.09761,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="7" frame="true" mapRotation="0" itemRotation="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" isTemporal="0" excludeFromExports="0" id="Trail Start" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="7" size="179.156,189.279,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" itemRotation="0" id="Trail Start" position="112.643,4.09761,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="112.643,4.09761,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" xmax="18.42354248737832023" ymin="-33.95772328900195447"/>
+        <Extent ymin="-33.95772328900195447" xmax="18.42354248737832023" ymax="-33.92484901666441743" xmin="18.3924263991010406"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" blendMode="0" drawCanvasItems="false" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="5.86559,4.09761,mm" positionLock="true" type="65639" size="67.7828,166.874,mm" positionOnPage="5.86559,4.09761,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="6" frame="true" mapRotation="0" itemRotation="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" isTemporal="0" excludeFromExports="0" id="Left inset 21KM" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="6" size="67.7828,166.874,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" itemRotation="0" id="Left inset 21KM" position="5.86559,4.09761,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" xmax="18.38626092146919788" ymin="-33.94700000000000273"/>
+        <Extent ymin="-33.94700000000000273" xmax="18.38626092146919788" ymax="-33.91681492292400435" xmin="18.37399999999999878"/>
         <LayerSet/>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="133.191,119.125,mm" positionLock="true" type="65639" size="113.3,76.1023,mm" positionOnPage="133.191,119.125,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="5" frame="true" mapRotation="0" itemRotation="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" isTemporal="0" excludeFromExports="0" id="Bottom inset 21KM" opacity="1">
-        <FrameColor green="34" blue="144" red="103" alpha="255"/>
-        <BackgroundColor green="175" blue="215" red="200" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="5" size="113.3,76.1023,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" itemRotation="0" id="Bottom inset 21KM" position="133.191,119.125,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="133.191,119.125,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="103" alpha="255" green="34" blue="144"/>
+        <BackgroundColor red="200" alpha="255" green="175" blue="215"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" xmax="18.42329132157224336" ymin="-33.9168317482614512"/>
+        <Extent ymin="-33.9168317482614512" xmax="18.42329132157224336" ymax="-33.91132718340826813" xmin="18.41509620662891678"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="19.6693,7.89412,mm" positionLock="true" type="65639" size="68.3676,117.12,mm" positionOnPage="19.6693,7.89412,mm" mapFlags="0" followPreset="true" visibility="0" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="4" frame="true" mapRotation="0" itemRotation="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" isTemporal="0" excludeFromExports="0" id="End inset Trail" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="0" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="4" size="68.3676,117.12,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" itemRotation="0" id="End inset Trail" position="19.6693,7.89412,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="19.6693,7.89412,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" xmax="18.41240136424316276" ymin="-33.91454383501641701"/>
+        <Extent ymin="-33.91454383501641701" xmax="18.41240136424316276" ymax="-33.90099106513847005" xmin="18.4044900556177744"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="170.062,49.6297,mm" positionLock="true" type="65639" size="63.655,88.3012,mm" positionOnPage="170.062,49.6297,mm" mapFlags="0" followPreset="true" visibility="0" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="3" frame="true" mapRotation="0" itemRotation="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" isTemporal="0" excludeFromExports="0" id="Start inset Trail" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="0" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="3" size="63.655,88.3012,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" itemRotation="0" id="Start inset Trail" position="170.062,49.6297,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="170.062,49.6297,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" xmax="18.4185691326545431" ymin="-33.94823764719958348"/>
+        <Extent ymin="-33.94823764719958348" xmax="18.4185691326545431" ymax="-33.94253141264477591" xmin="18.41445559427620893"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{917a530c-14f4-4ed8-b109-961939435221}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="200.321,125.314,mm" positionLock="true" type="65639" size="75.8756,69.7635,mm" positionOnPage="200.321,125.314,mm" mapFlags="0" followPreset="true" visibility="0" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="2" frame="true" mapRotation="0" itemRotation="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" isTemporal="0" excludeFromExports="0" id="Contour inset Trail" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="0" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="2" size="75.8756,69.7635,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" itemRotation="0" id="Contour inset Trail" position="200.321,125.314,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{917a530c-14f4-4ed8-b109-961939435221}" followPresetName="Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="200.321,125.314,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" xmax="18.42332635419156972" ymin="-33.95702588572736147"/>
+        <Extent ymin="-33.95702588572736147" xmax="18.42332635419156972" ymax="-33.94692690566557047" xmin="18.41234259163472942"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="1" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="1" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" blendMode="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.15,mm" keepLayerSet="false" position="9.50144,5.50066,mm" positionLock="false" type="65639" size="282.372,186.105,mm" positionOnPage="9.50144,5.50066,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="round" referencePoint="0" labelMargin="0,mm" zValue="1" frame="true" mapRotation="0" itemRotation="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" isTemporal="0" excludeFromExports="0" id="Main Map" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="282.372,186.105,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" itemRotation="0" id="Main Map" position="9.50144,5.50066,mm" isTemporal="0" frameJoinStyle="round" opacity="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" followPresetName="Routes" followPreset="true" positionLock="false" labelMargin="0,mm" positionOnPage="9.50144,5.50066,mm" outlineWidthM="0.15,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="true" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89975491900725046" xmin="18.36400000000000077" xmax="18.45389078049076304" ymin="-33.95900000000000318"/>
+        <Extent ymin="-33.95900000000000318" xmax="18.45389078049076304" ymax="-33.89975491900725046" xmin="18.36400000000000077"/>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -33455,44 +33457,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -33515,40 +33517,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -33563,29 +33565,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33593,34 +33595,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" position="3" show="1" blendMode="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" inverted="0">
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <ComposerMapOverview inverted="0" position="3" centered="0" name="Overview 1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" show="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
-                <Option type="Map" name="properties">
-                  <Option type="Map" name="alpha">
-                    <Option type="bool" name="active" value="true"/>
-                    <Option type="QString" name="expression" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
-                    <Option type="int" name="type" value="3"/>
+                <Option name="name" type="QString" value=""/>
+                <Option name="properties" type="Map">
+                  <Option name="alpha" type="Map">
+                    <Option name="active" type="bool" value="true"/>
+                    <Option name="expression" type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))"/>
+                    <Option name="type" type="int" value="3"/>
                   </Option>
                 </Option>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="103,34,144,26"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="103,34,144,255"/>
-                <Option type="QString" name="outline_style" value="solid"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="103,34,144,26"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="103,34,144,255"/>
+                <Option name="outline_style" type="QString" value="solid"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="103,34,144,26" k="color"/>
@@ -33635,9 +33637,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33645,9 +33647,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33655,63 +33657,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.06" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="true"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="singleFile" type="QString" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortKey="&quot;Sort&quot;" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" sortAscending="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortFeatures="1" coverageLayerName="all_routes" filterFeatures="1" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" enabled="1" hideCoverage="0" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerName="all_routes" sortKey="&quot;Sort&quot;" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortAscending="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;"/>
     </Layout>
-    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -33726,49 +33728,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="594,841,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="594,841,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -33783,9 +33785,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -33793,15 +33795,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="8" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="4,4,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="25.5925,18.7971,mm" background="true" frame="false" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="25.5925,18.7971,mm" frame="false" resizeToContents="1" size="4,4,mm" fontColor="#000000" zValue="8" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="25.5925,18.7971,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33809,37 +33811,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="1" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" legend_exp="" id="all_routes20170907054841602">
+            <layer-tree-layer expanded="1" patch_size="0,0" id="all_routes20170907054841602" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="QString" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="QString" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33847,47 +33849,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" blendMode="0" outlineWidthM="0.3,mm" position="5.2963,808.939,mm" positionLock="true" type="65641" size="91.9494,15.0649,mm" positionOnPage="5.2963,808.939,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="7" frame="false" labelText="MARSHAL POSITIONS" itemRotation="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="7" marginX="1" size="91.9494,15.0649,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginY="1" itemRotation="0" id="" position="5.2963,808.939,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" halign="1" positionLock="true" htmlState="0" positionOnPage="5.2963,808.939,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="MARSHAL POSITIONS">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33902,65 +33904,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" blendMode="0" outlineWidthM="0.3,mm" position="430.403,825.052,mm" positionLock="true" type="65641" size="56.6212,15.3656,mm" positionOnPage="430.403,825.052,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="REVISION 1.2" itemRotation="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="1" size="56.6212,15.3656,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginY="1" itemRotation="0" id="" position="430.403,825.052,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" halign="2" positionLock="true" htmlState="0" positionOnPage="430.403,825.052,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 1.2">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -33975,65 +33977,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{d177957c-7ab6-40ae-8769-347428500538}" blendMode="0" outlineWidthM="0.3,mm" position="372.175,808.942,mm" positionLock="true" type="65641" size="114.848,15.0635,mm" positionOnPage="372.175,808.942,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" labelText="Sunday, 20 October 2019" itemRotation="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="4" marginX="1" size="114.848,15.0635,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginY="1" itemRotation="0" id="" position="372.175,808.942,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{d177957c-7ab6-40ae-8769-347428500538}" halign="2" positionLock="true" htmlState="0" positionOnPage="372.175,808.942,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Sunday, 20 October 2019">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34048,39 +34050,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="63.9757" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="489.557,775.395,mm" resizeMode="0" positionLock="true" type="65640" size="100.498,63.9757,mm" positionOnPage="489.557,775.395,mm" svgFillColor="255,255,255,255" anchorPoint="8" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" mode="1" itemRotation="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureWidth="63.5856" mapUuid="" excludeFromExports="0" file="../Gun_Run_Logo.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../Gun_Run_Logo.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="3" size="100.498,63.9757,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" itemRotation="0" id="" position="489.557,775.395,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" pictureHeight="63.9757" positionOnPage="489.557,775.395,mm" outlineWidthM="0.3,mm" pictureWidth="63.5856" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="8" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34088,42 +34090,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" blendMode="0" outlineWidthM="0.3,mm" position="5.4463,824.155,mm" positionLock="true" type="65643" size="481.428,0.606138,mm" positionOnPage="5.4463,824.155,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="2" frame="false" itemRotation="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="2" cornerRadiusMeasure="0,mm" size="481.428,0.606138,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" itemRotation="0" id="" position="5.4463,824.155,mm" frameJoinStyle="miter" opacity="1" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" shapeType="1" positionOnPage="5.4463,824.155,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -34138,90 +34140,90 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" blendMode="0" drawCanvasItems="false" followPresetName="Marshal plan" outlineWidthM="0.3,mm" keepLayerSet="false" position="3.94474,5.25965,mm" positionLock="true" type="65639" size="584.759,811.213,mm" positionOnPage="3.94474,5.25965,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="true" mapRotation="0" itemRotation="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="584.759,811.213,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" itemRotation="0" id="" position="3.94474,5.25965,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" followPresetName="Marshal plan" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="3.94474,5.25965,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" xmax="18.42299397558693741" ymin="-33.95821655848814657"/>
+        <Extent ymin="-33.95821655848814657" xmax="18.42299397558693741" ymax="-33.89072661913806428" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="complete_marshal_overview" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="virtual" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" enabled="1" hideCoverage="1" coverageLayerName="complete_marshal_overview" sortKey="page" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;"/>
     </Layout>
-    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -34236,49 +34238,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -34293,9 +34295,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34305,15 +34307,15 @@ def my_form_open(dialog, layer, feature):
           <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="0" zValue="15" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="34.45,40.8,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="244.484,130.172,mm" background="true" frame="true" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="244.484,130.172,mm" minSymbolSize="0" excludeFromExports="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="185"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="244.484,130.172,mm" frame="true" resizeToContents="1" size="34.45,40.8,mm" fontColor="#000000" zValue="15" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="244.484,130.172,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="0" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="185" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34321,35 +34323,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Residents Access" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Residents Access" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="residents_access_roads" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="residents_access_roads">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34357,47 +34359,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" blendMode="0" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" positionLock="true" type="65641" size="194.851,7.272,mm" positionOnPage="9.37446,191.81,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="ACCESS ROUTES FOR RESIDENTS" itemRotation="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="194.851,7.272,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginY="1" itemRotation="0" id="" position="9.37446,191.81,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" halign="1" positionLock="true" htmlState="0" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="ACCESS ROUTES FOR RESIDENTS">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="14" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="14" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34412,65 +34414,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" blendMode="0" outlineWidthM="0.3,mm" position="204.225,191.81,mm" positionLock="true" type="65641" size="57.4836,6.8714,mm" positionOnPage="204.225,191.81,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="REVISION 1.1" itemRotation="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="1" size="57.4836,6.8714,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginY="1" itemRotation="0" id="" position="204.225,191.81,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" halign="2" positionLock="true" htmlState="0" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 1.1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34485,65 +34487,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" blendMode="0" outlineWidthM="0.3,mm" position="210.038,199.082,mm" positionLock="true" type="65641" size="51.6706,6.60801,mm" positionOnPage="210.038,199.082,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="Sunday, 20 October 2019" itemRotation="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="1" size="51.6706,6.60801,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginY="1" itemRotation="0" id="" position="210.038,199.082,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" halign="2" positionLock="true" htmlState="0" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Sunday, 20 October 2019">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -34558,39 +34560,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="262.196,188.218,mm" resizeMode="0" positionLock="true" type="65640" size="29.7523,17.4718,mm" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255" anchorPoint="4" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="1" itemRotation="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureWidth="17.3653" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" file="../Gun_Run_Logo.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../Gun_Run_Logo.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="29.7523,17.4718,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" itemRotation="0" id="" position="262.196,188.218,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" pictureHeight="17.4718" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="17.3653" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="4" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34598,42 +34600,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" blendMode="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" positionLock="true" type="65643" size="251.959,0.1,mm" positionOnPage="9.59946,198.832,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" itemRotation="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" itemRotation="0" id="" position="9.59946,198.832,mm" frameJoinStyle="miter" opacity="1" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" shapeType="1" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -34648,61 +34650,61 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" blendMode="0" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.3,mm" keepLayerSet="false" position="5.86559,4.09761,mm" positionLock="true" type="65639" size="67.7828,166.874,mm" positionOnPage="5.86559,4.09761,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="2" frame="true" mapRotation="0" itemRotation="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="2" size="67.7828,166.874,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" itemRotation="0" id="" position="5.86559,4.09761,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" followPresetName="Access Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" outlineWidthM="0.3,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMax">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMax" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedOpacity">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="int" name="type" value="1"/>
-                  <Option type="QString" name="val" value=""/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="type" type="int" value="1"/>
+                  <Option name="val" type="QString" value=""/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" xmax="18.38563681624126289" ymin="-33.94652930000000168"/>
+        <Extent ymin="-33.94652930000000168" xmax="18.38563681624126289" ymax="-33.91513741583252539" 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>
@@ -34717,45 +34719,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -34786,44 +34788,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -34846,40 +34848,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -34894,29 +34896,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34924,45 +34926,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" blendMode="0" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.15,mm" keepLayerSet="false" position="9.44946,9.08557,mm" positionLock="true" type="65639" size="282.012,175.592,mm" positionOnPage="9.44946,9.08557,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="round" referencePoint="0" labelMargin="0,mm" zValue="1" frame="true" mapRotation="0" itemRotation="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="282.012,175.592,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" itemRotation="0" id="" position="9.44946,9.08557,mm" isTemporal="0" frameJoinStyle="round" opacity="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" followPresetName="Access Routes" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" outlineWidthM="0.15,mm" frame="true" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" xmax="18.42303507276415431" ymin="-33.92999999999999972"/>
+        <Extent ymin="-33.92999999999999972" xmax="18.42303507276415431" ymax="-33.89697816224119009" 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>
@@ -34977,45 +34979,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -35046,44 +35048,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -35106,40 +35108,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -35154,29 +35156,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35184,56 +35186,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" sortFeatures="0" coverageLayerName="residents_access" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="1" hideCoverage="1" coverageLayerName="residents_access" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
-    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -35248,49 +35250,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -35305,9 +35307,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -35317,47 +35319,47 @@ def my_form_open(dialog, layer, feature):
           <Guide page="0" position="0" orientation="2" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="false" valign="64" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" blendMode="0" outlineWidthM="0.3,mm" position="9.37446,191.81,mm" positionLock="true" type="65641" size="194.851,7.272,mm" positionOnPage="9.37446,191.81,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="Access to P9 Parking and VIP Tent" itemRotation="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="194.851,7.272,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginY="1" itemRotation="0" id="" position="9.37446,191.81,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" halign="1" positionLock="true" htmlState="0" positionOnPage="9.37446,191.81,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Access to P9 Parking and VIP Tent">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="14" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="14" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35372,65 +35374,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" blendMode="0" outlineWidthM="0.3,mm" position="204.225,191.81,mm" positionLock="true" type="65641" size="57.4836,6.8714,mm" positionOnPage="204.225,191.81,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="REVISION 1.0" itemRotation="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="1" size="57.4836,6.8714,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginY="1" itemRotation="0" id="" position="204.225,191.81,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" halign="2" positionLock="true" htmlState="0" positionOnPage="204.225,191.81,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 1.0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35445,65 +35447,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" blendMode="0" outlineWidthM="0.3,mm" position="210.038,199.082,mm" positionLock="true" type="65641" size="51.6706,6.60801,mm" positionOnPage="210.038,199.082,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="Sunday, 20 October 2019" itemRotation="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="1" size="51.6706,6.60801,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginY="1" itemRotation="0" id="" position="210.038,199.082,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" halign="2" positionLock="true" htmlState="0" positionOnPage="210.038,199.082,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Sunday, 20 October 2019">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -35518,39 +35520,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="262.196,188.218,mm" resizeMode="0" positionLock="true" type="65640" size="29.7523,17.4718,mm" positionOnPage="262.196,188.218,mm" svgFillColor="255,255,255,255" anchorPoint="4" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="1" itemRotation="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureWidth="17.3653" mapUuid="" excludeFromExports="0" file="../Gun_Run_Logo.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../Gun_Run_Logo.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="29.7523,17.4718,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" itemRotation="0" id="" position="262.196,188.218,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" pictureHeight="17.4718" positionOnPage="262.196,188.218,mm" outlineWidthM="0.3,mm" pictureWidth="17.3653" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="4" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35558,42 +35560,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" blendMode="0" outlineWidthM="0.3,mm" position="9.59946,198.832,mm" positionLock="true" type="65643" size="251.959,0.1,mm" positionOnPage="9.59946,198.832,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" itemRotation="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" cornerRadiusMeasure="0,mm" size="251.959,0.1,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" itemRotation="0" id="" position="9.59946,198.832,mm" frameJoinStyle="miter" opacity="1" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" shapeType="1" positionOnPage="9.59946,198.832,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -35608,46 +35610,46 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" blendMode="0" drawCanvasItems="false" followPresetName="" outlineWidthM="0.15,mm" keepLayerSet="false" position="9.44946,7.25098,mm" positionLock="false" type="65639" size="282.012,182.649,mm" positionOnPage="9.44946,7.25098,mm" mapFlags="0" followPreset="false" visibility="1" groupUuid="" frameJoinStyle="round" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="282.012,182.649,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" itemRotation="0" id="" position="9.44946,7.25098,mm" isTemporal="0" frameJoinStyle="round" opacity="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" followPresetName="" followPreset="false" positionLock="false" labelMargin="0,mm" positionOnPage="9.44946,7.25098,mm" outlineWidthM="0.15,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="true"/>
-                  <Option type="QString" name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
-                  <Option type="int" name="type" value="3"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="true"/>
+                  <Option name="expression" type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" xmax="18.40919746780259914" ymin="-33.90848231674397084"/>
+        <Extent ymin="-33.90848231674397084" xmax="18.40919746780259914" ymax="-33.90319854486631357" 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>
@@ -35662,45 +35664,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="0" bottomFrameDivisions="0" leftAnnotationDisplay="0" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="0" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="0" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="0" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridStyle="0" rightAnnotationDisplay="0" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="0" topAnnotationDisplay="0" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="0" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="0" topAnnotationDisplay="0" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" topAnnotationDirection="0" blendMode="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedTicksEnabled="0" bottomAnnotationDisplay="0" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="0" intervalY="0" leftFrameDivisions="0" unit="0" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="0,0,0,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="0,0,0,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -35731,44 +35733,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -35791,40 +35793,40 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -35839,29 +35841,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -35869,56 +35871,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="QString" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="QString" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="singleFile" value="false"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="QString" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfDisableRasterTiles" type="QString" value="0"/>
+          <Option name="pdfIncludeMetadata" type="QString" value="1"/>
+          <Option name="pdfTextFormat" type="QString" value="0"/>
+          <Option name="singleFile" type="QString" value="false"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" sortFeatures="0" coverageLayerName="residents_access" filterFeatures="0" enabled="0"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" enabled="0" hideCoverage="1" coverageLayerName="residents_access" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;"/>
     </Layout>
-    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -35933,49 +35935,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,420,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,420,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -35990,9 +35992,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -36000,47 +36002,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem background="false" valign="32" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" blendMode="0" outlineWidthM="0.3,mm" position="112.086,406.476,mm" positionLock="true" type="65641" size="23.5967,8.3142,mm" positionOnPage="112.086,406.476,mm" marginY="1" visibility="1" htmlState="1" groupUuid="" halign="4" frameJoinStyle="miter" referencePoint="0" zValue="9" frame="false" labelText="Page [% &quot;page&quot; %] " itemRotation="0" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="9" marginX="0" size="23.5967,8.3142,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" marginY="1" itemRotation="0" id="" position="112.086,406.476,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" halign="4" positionLock="true" htmlState="1" positionOnPage="112.086,406.476,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Page [% &quot;page&quot; %] ">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36055,65 +36057,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" blendMode="0" outlineWidthM="0.3,mm" position="214.292,406.874,mm" positionLock="true" type="65641" size="27.7839,7.51682,mm" positionOnPage="214.292,406.874,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="REVISION 4.1" itemRotation="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="27.7839,7.51682,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" marginY="1" itemRotation="0" id="" position="214.292,406.874,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" halign="2" positionLock="true" htmlState="0" positionOnPage="214.292,406.874,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 4.1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36128,33 +36130,33 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="7" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="21.6797,33,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="15.6525,12.5708,mm" background="true" frame="false" resizeToContents="1" visibility="1" legendFilterByAtlas="0" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="15.6525,12.5708,mm" frame="false" resizeToContents="1" size="21.6797,33,mm" fontColor="#000000" zValue="7" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="15.6525,12.5708,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36162,37 +36164,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="1">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="1" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -36200,47 +36202,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" blendMode="0" outlineWidthM="0.3,mm" position="5.69321,398.344,mm" positionLock="true" type="65641" size="45.1194,8.13137,mm" positionOnPage="5.69321,398.344,mm" marginY="1" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="MARSHAL POSITIONS" itemRotation="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="0" size="45.1194,8.13137,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" marginY="1" itemRotation="0" id="" position="5.69321,398.344,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" halign="1" positionLock="true" htmlState="0" positionOnPage="5.69321,398.344,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="MARSHAL POSITIONS">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36255,65 +36257,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" blendMode="0" outlineWidthM="0.3,mm" position="5.69321,406.988,mm" positionLock="true" type="65641" size="118.192,7.80192,mm" positionOnPage="5.69321,406.988,mm" marginY="1" visibility="1" htmlState="1" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" 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>" itemRotation="0" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="0" size="118.192,7.80192,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" marginY="1" itemRotation="0" id="" position="5.69321,406.988,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" halign="1" positionLock="true" htmlState="1" positionOnPage="5.69321,406.988,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="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>">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36328,65 +36330,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" blendMode="0" outlineWidthM="0.3,mm" position="148.501,398.344,mm" positionLock="true" type="65641" size="93.5757,8.13167,mm" positionOnPage="148.501,398.344,mm" marginY="1" visibility="1" htmlState="1" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" 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>" itemRotation="0" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="4" marginX="0" size="93.5757,8.13167,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" marginY="1" itemRotation="0" id="" position="148.501,398.344,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" halign="2" positionLock="true" htmlState="1" positionOnPage="148.501,398.344,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="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>">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36401,39 +36403,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="26.4325" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="243.319,382.696,mm" resizeMode="0" positionLock="true" type="65640" size="49.3143,31.2967,mm" positionOnPage="243.319,382.696,mm" svgFillColor="255,255,255,255" anchorPoint="8" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" mode="1" itemRotation="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureWidth="49.3143" mapUuid="" excludeFromExports="0" file="../GunRun2022_250.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_250.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="3" size="49.3143,31.2967,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" itemRotation="0" id="" position="243.319,382.696,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionLock="true" pictureHeight="26.4325" positionOnPage="243.319,382.696,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="8" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36441,42 +36443,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" blendMode="0" outlineWidthM="0.3,mm" position="5.84321,406.626,mm" positionLock="true" type="65643" size="236.083,0.14328,mm" positionOnPage="5.84321,406.626,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="2" frame="false" itemRotation="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="2" cornerRadiusMeasure="0,mm" size="236.083,0.14328,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" itemRotation="0" id="" position="5.84321,406.626,mm" frameJoinStyle="miter" opacity="1" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" shapeType="1" positionOnPage="5.84321,406.626,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -36491,97 +36493,97 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem background="true" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" blendMode="0" drawCanvasItems="false" followPresetName="Marshal plan" outlineWidthM="0.3,mm" keepLayerSet="false" position="5.03,5.9483,mm" positionLock="true" type="65639" size="286.94,392.396,mm" positionOnPage="5.03,5.9483,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" isTemporal="0" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="true" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="286.94,392.396,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" itemRotation="0" id="" position="5.03,5.9483,mm" isTemporal="0" frameJoinStyle="miter" opacity="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" followPresetName="Marshal plan" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapScale">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapXMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapXMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
-                <Option type="Map" name="dataDefinedMapYMin">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value=""/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedMapYMin" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value=""/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.9248732774534929" xmin="18.36924763341120581" xmax="18.38613924055453452" ymin="-33.94797288016832226"/>
+        <Extent ymin="-33.94797288016832226" xmax="18.38613924055453452" ymax="-33.9248732774534929" xmin="18.36924763341120581"/>
         <LayerSet/>
-        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" filenamePattern="'output_'||@atlas_featurenumber" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="marshal_overviews" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="ogr" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" enabled="1" hideCoverage="1" coverageLayerName="marshal_overviews" sortKey="page" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;"/>
     </Layout>
-    <Layout name="Fencing - Cones only" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGrid="0" tolerance="5" snapToGuides="1" snapToItems="1"/>
-      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
+    <Layout worldFileMap="" name="Fencing - Cones only" units="mm" printResolution="300">
+      <Snapper tolerance="5" snapToGrid="0" snapToGuides="1" snapToItems="1"/>
+      <Grid resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0" resolution="10"/>
       <PageCollection>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="255,255,255,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="no"/>
-              <Option type="QString" name="outline_width" value="0.26"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="255,255,255,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="no"/>
+              <Option name="outline_width" type="QString" value="0.26"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="255,255,255,255" k="color"/>
@@ -36596,49 +36598,49 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem background="true" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" blendMode="0" outlineWidthM="0.3,mm" position="0,0,mm" positionLock="false" type="65638" size="297,210,mm" positionOnPage="0,0,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="0" frame="false" itemRotation="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" excludeFromExports="0" id="" opacity="1">
-          <FrameColor green="0" blue="0" red="0" alpha="255"/>
-          <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+        <LayoutItem referencePoint="0" visibility="1" background="true" excludeFromExports="0" groupUuid="" zValue="0" size="297,210,mm" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" itemRotation="0" id="" position="0,0,mm" frameJoinStyle="miter" opacity="1" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" positionOnPage="0,0,mm" outlineWidthM="0.3,mm" frame="false" type="65638" blendMode="0">
+          <FrameColor red="0" alpha="255" green="0" blue="0"/>
+          <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="miter"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="miter"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -36653,9 +36655,9 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -36663,15 +36665,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem splitLayer="0" lineSpacing="1" type="65642" groupUuid="" equalColumnWidth="1" zValue="11" maxSymbolSize="0" itemRotation="0" symbolWidth="7" size="38.1563,53.7608,mm" rasterBorderWidth="0" referencePoint="0" rasterBorder="1" positionLock="true" columnCount="1" fontColor="#000000" blendMode="0" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" rasterBorderColor="0,0,0,255" title="" symbolHeight="4" position="256.808,5.21277,mm" background="true" frame="true" resizeToContents="0" visibility="1" legendFilterByAtlas="0" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" symbolAlignment="1" opacity="1" wmsLegendHeight="25" boxSpace="2" id="" frameJoinStyle="miter" columnSpace="2" wmsLegendWidth="50" titleAlignment="1" outlineWidthM="0.3,mm" wrapChar="" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" excludeFromExports="0" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem symbolAlignment="1" positionOnPage="256.808,5.21277,mm" frame="true" resizeToContents="0" size="38.1563,53.7608,mm" fontColor="#000000" zValue="11" wrapChar="" splitLayer="0" itemRotation="0" positionLock="true" frameJoinStyle="miter" lineSpacing="1" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" visibility="1" outlineWidthM="0.3,mm" wmsLegendWidth="50" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" minSymbolSize="0" symbolHeight="4" title="" rasterBorderColor="0,0,0,255" referencePoint="0" opacity="1" columnCount="1" groupUuid="" excludeFromExports="0" position="256.808,5.21277,mm" rasterBorderWidth="0" rasterBorder="1" titleAlignment="1" symbolWidth="7" id="" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" blendMode="0" wmsLegendHeight="25" equalColumnWidth="1" maxSymbolSize="0" columnSpace="2" background="true" boxSpace="2" legendFilterByAtlas="0" type="65642">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -36679,53 +36681,53 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <styleFont style="Bold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" italic="0"/>
+          <style alignment="1" indent="0" name="title">
+            <styleFont strikethrough="0" style="Bold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold"/>
           </style>
-          <style indent="0" name="group" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="group">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="subgroup" alignment="1" marginTop="3">
-            <styleFont style="Semibold" strikethrough="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" italic="0"/>
+          <style alignment="1" marginTop="3" indent="0" name="subgroup">
+            <styleFont strikethrough="0" style="Semibold" italic="0" underline="0" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold"/>
           </style>
-          <style indent="0" name="symbol" alignment="1" marginTop="2.5">
-            <styleFont style="" strikethrough="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2.5" indent="0" name="symbol">
+            <styleFont strikethrough="0" style="" italic="0" underline="0" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0"/>
           </style>
-          <style indent="0" name="symbolLabel" marginLeft="2" alignment="1" marginTop="2">
-            <styleFont style="Regular" strikethrough="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" italic="0"/>
+          <style alignment="1" marginTop="2" marginLeft="2" indent="0" name="symbolLabel">
+            <styleFont strikethrough="0" style="Regular" italic="0" underline="0" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="fencing" expanded="1" source="./fencing.shp|layername=fencing" legend_exp="" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./fencing.shp|layername=fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option type="QString" name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-                  <Option type="QString" name="legend/expressionFilter" value=""/>
-                  <Option type="QString" name="legend/expressionFilterEnabled" value="false"/>
-                  <Option type="QString" name="legend/node-order" value="1,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
+                  <Option name="expandedLegendNodes" type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+                  <Option name="legend/expressionFilter" type="QString" value=""/>
+                  <Option name="legend/expressionFilterEnabled" type="QString" value="false"/>
+                  <Option name="legend/node-order" type="QString" value="1,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Routes" expanded="1" groupLayer="">
+          <layer-tree-group expanded="1" checked="Qt::Checked" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" patch_size="0,0" legend_split_behavior="0" name="all_routes" expanded="1" source="./all_routes.shp|layername=all_routes" legend_exp="" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr">
+            <layer-tree-layer providerKey="ogr" expanded="1" patch_size="0,0" source="./all_routes.shp|layername=all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_split_behavior="0" checked="Qt::Checked" legend_exp="" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option type="QString" name="legend/node-order" value="1,2,3,4"/>
-                  <Option type="QString" name="legend/title-style" value="hidden"/>
-                  <Option type="int" name="showFeatureCount" value="0"/>
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <Option name="legend/node-order" type="QString" value="1,2,3,4"/>
+                  <Option name="legend/title-style" type="QString" value="hidden"/>
+                  <Option name="showFeatureCount" type="int" value="0"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -36733,47 +36735,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,191.188,mm" positionLock="true" type="65641" size="148.46,6.45211,mm" positionOnPage="6.76779,191.188,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="10" frame="false" labelText="CONES: [% &quot;name&quot; %]" itemRotation="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="10" marginX="0" size="148.46,6.45211,mm" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" marginY="0" itemRotation="0" id="" position="6.76779,191.188,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" halign="1" positionLock="true" htmlState="0" positionOnPage="6.76779,191.188,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="CONES: [% &quot;name&quot; %]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="63" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="63" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36788,65 +36790,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="64" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" blendMode="0" outlineWidthM="0.3,mm" position="182.723,191.188,mm" positionLock="true" type="65641" size="56.3557,6.45237,mm" positionOnPage="182.723,191.188,mm" marginY="0" visibility="1" htmlState="1" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="9" frame="false" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" itemRotation="0" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="9" marginX="0" size="56.3557,6.45237,mm" templateUuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" marginY="0" itemRotation="0" id="" position="182.723,191.188,mm" frameJoinStyle="miter" opacity="1" valign="64" uuid="{6273ffb7-0dbc-48f5-a0f5-23367ef019c3}" halign="2" positionLock="true" htmlState="1" positionOnPage="182.723,191.188,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36861,65 +36863,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" blendMode="0" outlineWidthM="0.3,mm" position="209.146,198.083,mm" positionLock="true" type="65641" size="26.8205,6.82826,mm" positionOnPage="209.146,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="2" frameJoinStyle="miter" referencePoint="0" zValue="8" frame="false" labelText="REVISION 2.1" itemRotation="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="8" marginX="0" size="26.8205,6.82826,mm" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" marginY="0" itemRotation="0" id="" position="209.146,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" halign="2" positionLock="true" htmlState="0" positionOnPage="209.146,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="REVISION 2.1">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -36934,65 +36936,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" blendMode="0" outlineWidthM="0.3,mm" position="62.6706,198.083,mm" positionLock="true" type="65641" size="51.1638,7.07327,mm" positionOnPage="62.6706,198.083,mm" marginY="1" visibility="0" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="7" frame="false" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" itemRotation="0" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" excludeFromExports="0" id="" opacity="1" marginX="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="0" background="false" excludeFromExports="0" groupUuid="" zValue="7" marginX="1" size="51.1638,7.07327,mm" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" marginY="1" itemRotation="0" id="" position="62.6706,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" halign="1" positionLock="true" htmlState="0" positionOnPage="62.6706,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -37007,65 +37009,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" blendMode="0" outlineWidthM="0.3,mm" position="116.805,198.083,mm" positionLock="true" type="65641" size="64.7594,7.10512,mm" positionOnPage="116.805,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="6" frame="false" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" itemRotation="0" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="6" marginX="0" size="64.7594,7.10512,mm" templateUuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" marginY="0" itemRotation="0" id="" position="116.805,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{cb6b5538-c5ad-47e3-95a1-f7f17db39372}" halign="1" positionLock="true" htmlState="0" positionOnPage="116.805,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -37080,65 +37082,65 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" valign="32" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" blendMode="0" outlineWidthM="0.3,mm" position="6.76779,198.083,mm" positionLock="true" type="65641" size="90.2083,7.07327,mm" positionOnPage="6.76779,198.083,mm" marginY="0" visibility="1" htmlState="0" groupUuid="" halign="1" frameJoinStyle="miter" referencePoint="0" zValue="5" frame="false" labelText="Page [% @atlas_featurenumber %]" itemRotation="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" excludeFromExports="0" id="" opacity="1" marginX="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="5" marginX="0" size="90.2083,7.07327,mm" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" marginY="0" itemRotation="0" id="" position="6.76779,198.083,mm" frameJoinStyle="miter" opacity="1" valign="32" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" halign="1" positionLock="true" htmlState="0" positionOnPage="6.76779,198.083,mm" outlineWidthM="0.3,mm" frame="false" type="65641" blendMode="0" labelText="Page [% @atlas_featurenumber %]">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -37153,39 +37155,39 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem background="false" pictureRotation="0" pictureHeight="26.4325" svgBorderColor="0,0,0,255" svgBorderWidth="0.2" northOffset="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" blendMode="0" outlineWidthM="0.3,mm" northMode="0" position="243.098,175.353,mm" resizeMode="0" positionLock="true" type="65640" size="49.3143,29.8354,mm" positionOnPage="243.098,175.353,mm" svgFillColor="255,255,255,255" anchorPoint="8" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="4" frame="false" mode="1" itemRotation="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" pictureWidth="49.3143" mapUuid="" excludeFromExports="0" file="../GunRun2022_250.png" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" file="../GunRun2022_250.png" mode="1" svgBorderColor="0,0,0,255" background="false" excludeFromExports="0" northOffset="0" resizeMode="0" groupUuid="" zValue="4" size="49.3143,29.8354,mm" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" itemRotation="0" id="" position="243.098,175.353,mm" frameJoinStyle="miter" opacity="1" svgFillColor="255,255,255,255" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" positionLock="true" pictureHeight="26.4325" positionOnPage="243.098,175.353,mm" outlineWidthM="0.3,mm" pictureWidth="49.3143" pictureRotation="0" frame="false" type="65640" blendMode="0" anchorPoint="8" mapUuid="" svgBorderWidth="0.2" northMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedSource">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="int" name="type" value="3"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -37193,42 +37195,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem background="false" shapeType="1" cornerRadiusMeasure="0,mm" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" blendMode="0" outlineWidthM="0.3,mm" position="6.91779,197.79,mm" positionLock="true" type="65643" size="232.01,0.14328,mm" positionOnPage="6.91779,197.79,mm" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" zValue="3" frame="false" itemRotation="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" excludeFromExports="0" id="" opacity="1">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" background="false" excludeFromExports="0" groupUuid="" zValue="3" cornerRadiusMeasure="0,mm" size="232.01,0.14328,mm" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" itemRotation="0" id="" position="6.91779,197.79,mm" frameJoinStyle="miter" opacity="1" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" shapeType="1" positionOnPage="6.91779,197.79,mm" outlineWidthM="0.3,mm" frame="false" type="65643" blendMode="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+        <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
           <data_defined_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer class="SimpleFill" enabled="1" locked="0" pass="0">
             <Option type="Map">
-              <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="color" value="0,0,0,255"/>
-              <Option type="QString" name="joinstyle" value="miter"/>
-              <Option type="QString" name="offset" value="0,0"/>
-              <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-              <Option type="QString" name="offset_unit" value="MM"/>
-              <Option type="QString" name="outline_color" value="0,0,0,255"/>
-              <Option type="QString" name="outline_style" value="solid"/>
-              <Option type="QString" name="outline_width" value="0.3"/>
-              <Option type="QString" name="outline_width_unit" value="MM"/>
-              <Option type="QString" name="style" value="solid"/>
+              <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="color" type="QString" value="0,0,0,255"/>
+              <Option name="joinstyle" type="QString" value="miter"/>
+              <Option name="offset" type="QString" value="0,0"/>
+              <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+              <Option name="offset_unit" type="QString" value="MM"/>
+              <Option name="outline_color" type="QString" value="0,0,0,255"/>
+              <Option name="outline_style" type="QString" value="solid"/>
+              <Option name="outline_width" type="QString" value="0.3"/>
+              <Option name="outline_width_unit" type="QString" value="MM"/>
+              <Option name="style" type="QString" value="solid"/>
             </Option>
             <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
             <prop v="0,0,0,255" k="color"/>
@@ -37243,55 +37245,55 @@ def my_form_open(dialog, layer, feature):
             <prop v="solid" k="style"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem unitType="meters" type="65646" groupUuid="" labelHorizontalPlacement="0" numSegments="2" labelVerticalPlacement="0" zValue="2" numUnitsPerSegment="30" lineCapStyle="square" itemRotation="0" labelBarSpace="1" size="84.9787,15.8378,mm" referencePoint="0" numSegmentsLeft="2" segmentMillimeters="25.0725" positionLock="true" style="Double Box" blendMode="0" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" unitLabel="m" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" numMapUnitsPerScaleBarUnit="1" position="6.76779,2.8482,mm" numSubdivisions="1" background="false" minBarWidth="25" frame="false" lineJoinStyle="round" visibility="1" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" opacity="1" maxBarWidth="100" subdivisionsHeight="1.5" alignment="0" segmentSizeMode="1" id="" frameJoinStyle="miter" outlineWidth="0.2" height="2" boxContentSpace="0.2" outlineWidthM="0.3,mm" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem unitType="meters" subdivisionsHeight="1.5" positionOnPage="6.76779,2.8482,mm" frame="false" size="109.51,15.8378,mm" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" labelVerticalPlacement="0" numSegmentsLeft="2" zValue="2" itemRotation="0" positionLock="true" numMapUnitsPerScaleBarUnit="1" labelHorizontalPlacement="0" frameJoinStyle="miter" labelBarSpace="1" visibility="1" maxBarWidth="100" outlineWidthM="0.3,mm" height="2" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" boxContentSpace="0.2" referencePoint="0" opacity="1" groupUuid="" numSegments="2" numSubdivisions="1" outlineWidth="0.2" excludeFromExports="0" position="6.76779,2.8482,mm" lineCapStyle="square" unitLabel="m" id="" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" blendMode="0" lineJoinStyle="round" segmentSizeMode="1" alignment="0" numUnitsPerSegment="20" background="false" minBarWidth="25" type="65646" style="Double Box" segmentMillimeters="33.2496">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="12" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+        <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="12" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-          <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-            <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+          <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+          <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="color" value="255,255,255,255"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                  <Option type="QString" name="outline_style" value="no"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="style" value="solid"/>
+                  <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="color" type="QString" value="255,255,255,255"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                  <Option name="outline_style" type="QString" value="no"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="style" type="QString" value="solid"/>
                 </Option>
                 <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                 <prop v="255,255,255,255" k="color"/>
@@ -37306,75 +37308,75 @@ def my_form_open(dialog, layer, feature):
                 <prop v="solid" k="style"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+          <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
+              <Option name="name" type="QString" value=""/>
               <Option name="properties"/>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor green="0" blue="0" red="0" alpha="255"/>
+        <strokeColor red="0" alpha="255" green="0" blue="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option type="QChar" name="decimal_separator" value=""/>
-            <Option type="int" name="decimals" value="6"/>
-            <Option type="int" name="rounding_type" value="0"/>
-            <Option type="bool" name="show_plus" value="false"/>
-            <Option type="bool" name="show_thousand_separator" value="true"/>
-            <Option type="bool" name="show_trailing_zeros" value="false"/>
-            <Option type="QChar" name="thousand_separator" value=""/>
+            <Option name="decimal_separator" type="QChar" value=""/>
+            <Option name="decimals" type="int" value="6"/>
+            <Option name="rounding_type" type="int" value="0"/>
+            <Option name="show_plus" type="bool" value="false"/>
+            <Option name="show_thousand_separator" type="bool" value="true"/>
+            <Option name="show_trailing_zeros" type="bool" value="false"/>
+            <Option name="thousand_separator" type="QChar" value=""/>
           </Option>
         </numericFormat>
-        <fillColor green="0" blue="0" red="0" alpha="255"/>
-        <fillColor2 green="255" blue="255" red="255" alpha="255"/>
+        <fillColor red="0" alpha="255" green="0" blue="0"/>
+        <fillColor2 red="255" alpha="255" green="255" blue="255"/>
         <lineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -37405,52 +37407,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -37481,52 +37483,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer class="SimpleLine" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="align_dash_pattern" value="0"/>
-                <Option type="QString" name="capstyle" value="square"/>
-                <Option type="QString" name="customdash" value="5;2"/>
-                <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="customdash_unit" value="MM"/>
-                <Option type="QString" name="dash_pattern_offset" value="0"/>
-                <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                <Option type="QString" name="draw_inside_polygon" value="0"/>
-                <Option type="QString" name="joinstyle" value="round"/>
-                <Option type="QString" name="line_color" value="0,0,0,255"/>
-                <Option type="QString" name="line_style" value="solid"/>
-                <Option type="QString" name="line_width" value="0.2"/>
-                <Option type="QString" name="line_width_unit" value="MM"/>
-                <Option type="QString" name="offset" value="0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="ring_filter" value="0"/>
-                <Option type="QString" name="trim_distance_end" value="0"/>
-                <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                <Option type="QString" name="trim_distance_start" value="0"/>
-                <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                <Option type="QString" name="use_custom_dash" value="0"/>
-                <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                <Option name="align_dash_pattern" type="QString" value="0"/>
+                <Option name="capstyle" type="QString" value="square"/>
+                <Option name="customdash" type="QString" value="5;2"/>
+                <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="customdash_unit" type="QString" value="MM"/>
+                <Option name="dash_pattern_offset" type="QString" value="0"/>
+                <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                <Option name="draw_inside_polygon" type="QString" value="0"/>
+                <Option name="joinstyle" type="QString" value="round"/>
+                <Option name="line_color" type="QString" value="0,0,0,255"/>
+                <Option name="line_style" type="QString" value="solid"/>
+                <Option name="line_width" type="QString" value="0.2"/>
+                <Option name="line_width_unit" type="QString" value="MM"/>
+                <Option name="offset" type="QString" value="0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="ring_filter" type="QString" value="0"/>
+                <Option name="trim_distance_end" type="QString" value="0"/>
+                <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                <Option name="trim_distance_start" type="QString" value="0"/>
+                <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                <Option name="use_custom_dash" type="QString" value="0"/>
+                <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
               </Option>
               <prop v="0" k="align_dash_pattern"/>
               <prop v="square" k="capstyle"/>
@@ -37557,36 +37559,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 type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="0,0,0,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="0,0,0,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="0,0,0,255" k="color"/>
@@ -37601,36 +37603,36 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol force_rhr="0" type="fill" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+          <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="fill" is_animated="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer class="SimpleFill" enabled="1" locked="0" pass="0">
               <Option type="Map">
-                <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="color" value="255,255,255,255"/>
-                <Option type="QString" name="joinstyle" value="bevel"/>
-                <Option type="QString" name="offset" value="0,0"/>
-                <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                <Option type="QString" name="offset_unit" value="MM"/>
-                <Option type="QString" name="outline_color" value="35,35,35,255"/>
-                <Option type="QString" name="outline_style" value="no"/>
-                <Option type="QString" name="outline_width" value="0.26"/>
-                <Option type="QString" name="outline_width_unit" value="MM"/>
-                <Option type="QString" name="style" value="solid"/>
+                <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="color" type="QString" value="255,255,255,255"/>
+                <Option name="joinstyle" type="QString" value="bevel"/>
+                <Option name="offset" type="QString" value="0,0"/>
+                <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                <Option name="offset_unit" type="QString" value="MM"/>
+                <Option name="outline_color" type="QString" value="35,35,35,255"/>
+                <Option name="outline_style" type="QString" value="no"/>
+                <Option name="outline_width" type="QString" value="0.26"/>
+                <Option name="outline_width_unit" type="QString" value="MM"/>
+                <Option name="style" type="QString" value="solid"/>
               </Option>
               <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
               <prop v="255,255,255,255" k="color"/>
@@ -37645,53 +37647,53 @@ def my_form_open(dialog, layer, feature):
               <prop v="solid" k="style"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem background="false" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" blendMode="0" drawCanvasItems="false" followPresetName="Cones" outlineWidthM="0.3,mm" keepLayerSet="false" position="6.76779,9.35102,mm" positionLock="true" type="65639" size="283.418,180.92,mm" positionOnPage="6.76779,9.35102,mm" mapFlags="0" followPreset="true" visibility="1" groupUuid="" frameJoinStyle="miter" referencePoint="0" labelMargin="0,mm" zValue="1" frame="false" mapRotation="0" itemRotation="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" isTemporal="0" excludeFromExports="0" id="" opacity="0.9">
-        <FrameColor green="0" blue="0" red="0" alpha="255"/>
-        <BackgroundColor green="255" blue="255" red="255" alpha="255"/>
+      <LayoutItem referencePoint="0" visibility="1" mapRotation="0" background="false" excludeFromExports="0" keepLayerSet="false" groupUuid="" zValue="1" size="283.418,180.92,mm" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" itemRotation="0" id="" position="6.76779,9.35102,mm" isTemporal="0" frameJoinStyle="miter" opacity="0.9" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" followPresetName="Cones" followPreset="true" positionLock="true" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" outlineWidthM="0.3,mm" frame="false" type="65639" blendMode="0" drawCanvasItems="false" mapFlags="0">
+        <FrameColor red="0" alpha="255" green="0" blue="0"/>
+        <BackgroundColor red="255" alpha="255" green="255" blue="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option type="QString" name="name" value=""/>
-              <Option type="Map" name="properties">
-                <Option type="Map" name="dataDefinedMapRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="expression" value=""/>
-                  <Option type="Map" name="transformer">
-                    <Option type="Map" name="d">
-                      <Option type="double" name="exponent" value="1"/>
-                      <Option type="double" name="maxOutput" value="360"/>
-                      <Option type="double" name="maxValue" value="0"/>
-                      <Option type="double" name="minOutput" value="0"/>
-                      <Option type="double" name="minValue" value="0"/>
-                      <Option type="double" name="nullOutput" value="0"/>
+              <Option name="name" type="QString" value=""/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="expression" type="QString" value=""/>
+                  <Option name="transformer" type="Map">
+                    <Option name="d" type="Map">
+                      <Option name="exponent" type="double" value="1"/>
+                      <Option name="maxOutput" type="double" value="360"/>
+                      <Option name="maxValue" type="double" value="0"/>
+                      <Option name="minOutput" type="double" value="0"/>
+                      <Option name="minValue" type="double" value="0"/>
+                      <Option name="nullOutput" type="double" value="0"/>
                     </Option>
-                    <Option type="int" name="t" value="0"/>
+                    <Option name="t" type="int" value="0"/>
                   </Option>
-                  <Option type="int" name="type" value="3"/>
+                  <Option name="type" type="int" value="3"/>
                 </Option>
-                <Option type="Map" name="dataDefinedRotation">
-                  <Option type="bool" name="active" value="false"/>
-                  <Option type="QString" name="field" value="angle"/>
-                  <Option type="int" name="type" value="2"/>
+                <Option name="dataDefinedRotation" type="Map">
+                  <Option name="active" type="bool" value="false"/>
+                  <Option name="field" type="QString" value="angle"/>
+                  <Option name="type" type="int" value="2"/>
                 </Option>
               </Option>
-              <Option type="QString" name="type" value="collection"/>
+              <Option name="type" type="QString" value="collection"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90025472328818523" xmin="18.40670677609454486" xmax="18.40975312970198985" ymin="-33.90219936134110412"/>
+        <Extent ymin="-33.90817940102677852" xmax="18.40522072458854552" ymax="-33.90720180625849167" xmin="18.40368928312333452"/>
         <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>
@@ -37706,45 +37708,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid rightAnnotationPosition="1" offsetX="0" gridFrameStyle="0" rightAnnotationDirection="0" annotationExpression="" leftAnnotationPosition="1" frameFillColor1="255,255,255,255" annotationPrecision="3" bottomAnnotationDisplay="3" bottomFrameDivisions="0" leftAnnotationDisplay="3" showAnnotation="0" rotatedTicksEnabled="0" rotatedTicksLengthMode="0" rightFrameDivisions="0" unit="1" minimumIntervalWidth="50" frameFillColor2="0,0,0,255" gridFramePenColor="0,0,0,255" blendMode="0" maximumIntervalWidth="100" topAnnotationPosition="1" intervalX="5" bottomAnnotationDirection="0" rotatedTicksMarginToCorner="0" gridFrameWidth="2" gridFrameSideFlags="15" annotationFormat="4" rotatedAnnotationsLengthMode="0" gridFrameMargin="0" position="3" bottomAnnotationPosition="1" topAnnotationDirection="0" offsetY="0" leftAnnotationDirection="0" rotatedAnnotationsMinimumAngle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridStyle="0" rightAnnotationDisplay="3" frameAnnotationDistance="1" leftFrameDivisions="0" topFrameDivisions="0" name="Grid 1" rotatedTicksMinimumAngle="0" intervalY="5" topAnnotationDisplay="3" rotatedAnnotationsEnabled="0" rotatedAnnotationsMarginToCorner="0" crossLength="3" show="0" gridFramePenThickness="0.5">
+        <ComposerMapGrid leftAnnotationPosition="1" annotationFormat="4" annotationPrecision="3" gridFramePenThickness="0.5" rotatedAnnotationsEnabled="0" gridFrameStyle="0" bottomFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" show="0" crossLength="3" rotatedTicksLengthMode="0" rightAnnotationDirection="0" rightAnnotationPosition="1" annotationExpression="" minimumIntervalWidth="50" name="Grid 1" rightFrameDivisions="0" rotatedAnnotationsLengthMode="0" leftAnnotationDirection="0" frameAnnotationDistance="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" intervalX="5" topAnnotationDisplay="3" maximumIntervalWidth="100" gridFrameMargin="0" topAnnotationPosition="1" offsetX="0" gridFrameSideFlags="15" bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" position="3" offsetY="0" bottomAnnotationDirection="0" rotatedTicksMinimumAngle="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" topAnnotationDirection="0" blendMode="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedTicksEnabled="0" bottomAnnotationDisplay="3" gridFramePenColor="0,0,0,255" gridFrameWidth="2" gridStyle="0" leftAnnotationDisplay="3" intervalY="5" leftFrameDivisions="0" unit="1" showAnnotation="0">
           <lineStyle>
-            <symbol force_rhr="0" type="line" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="line" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer class="SimpleLine" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="align_dash_pattern" value="0"/>
-                  <Option type="QString" name="capstyle" value="square"/>
-                  <Option type="QString" name="customdash" value="5;2"/>
-                  <Option type="QString" name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="customdash_unit" value="MM"/>
-                  <Option type="QString" name="dash_pattern_offset" value="0"/>
-                  <Option type="QString" name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="dash_pattern_offset_unit" value="MM"/>
-                  <Option type="QString" name="draw_inside_polygon" value="0"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="line_color" value="195,195,195,255"/>
-                  <Option type="QString" name="line_style" value="solid"/>
-                  <Option type="QString" name="line_width" value="0"/>
-                  <Option type="QString" name="line_width_unit" value="MM"/>
-                  <Option type="QString" name="offset" value="0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="ring_filter" value="0"/>
-                  <Option type="QString" name="trim_distance_end" value="0"/>
-                  <Option type="QString" name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_end_unit" value="MM"/>
-                  <Option type="QString" name="trim_distance_start" value="0"/>
-                  <Option type="QString" name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="trim_distance_start_unit" value="MM"/>
-                  <Option type="QString" name="tweak_dash_pattern_on_corners" value="0"/>
-                  <Option type="QString" name="use_custom_dash" value="0"/>
-                  <Option type="QString" name="width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
+                  <Option name="align_dash_pattern" type="QString" value="0"/>
+                  <Option name="capstyle" type="QString" value="square"/>
+                  <Option name="customdash" type="QString" value="5;2"/>
+                  <Option name="customdash_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="customdash_unit" type="QString" value="MM"/>
+                  <Option name="dash_pattern_offset" type="QString" value="0"/>
+                  <Option name="dash_pattern_offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="dash_pattern_offset_unit" type="QString" value="MM"/>
+                  <Option name="draw_inside_polygon" type="QString" value="0"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="line_color" type="QString" value="195,195,195,255"/>
+                  <Option name="line_style" type="QString" value="solid"/>
+                  <Option name="line_width" type="QString" value="0"/>
+                  <Option name="line_width_unit" type="QString" value="MM"/>
+                  <Option name="offset" type="QString" value="0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="ring_filter" type="QString" value="0"/>
+                  <Option name="trim_distance_end" type="QString" value="0"/>
+                  <Option name="trim_distance_end_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_end_unit" type="QString" value="MM"/>
+                  <Option name="trim_distance_start" type="QString" value="0"/>
+                  <Option name="trim_distance_start_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="trim_distance_start_unit" type="QString" value="MM"/>
+                  <Option name="tweak_dash_pattern_on_corners" type="QString" value="0"/>
+                  <Option name="use_custom_dash" type="QString" value="0"/>
+                  <Option name="width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
                 </Option>
                 <prop v="0" k="align_dash_pattern"/>
                 <prop v="square" k="capstyle"/>
@@ -37775,44 +37777,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 type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol force_rhr="0" type="marker" name="" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <symbol alpha="1" force_rhr="0" frame_rate="10" name="" clip_to_extent="1" type="marker" is_animated="0">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option type="QString" name="name" value=""/>
+                  <Option name="name" type="QString" value=""/>
                   <Option name="properties"/>
-                  <Option type="QString" name="type" value="collection"/>
+                  <Option name="type" type="QString" value="collection"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer class="SimpleMarker" enabled="1" locked="0" pass="0">
                 <Option type="Map">
-                  <Option type="QString" name="angle" value="0"/>
-                  <Option type="QString" name="cap_style" value="square"/>
-                  <Option type="QString" name="color" value="0,0,0,255"/>
-                  <Option type="QString" name="horizontal_anchor_point" value="1"/>
-                  <Option type="QString" name="joinstyle" value="bevel"/>
-                  <Option type="QString" name="name" value="circle"/>
-                  <Option type="QString" name="offset" value="0,0"/>
-                  <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="offset_unit" value="MM"/>
-                  <Option type="QString" name="outline_color" value="0,0,0,255"/>
-                  <Option type="QString" name="outline_style" value="solid"/>
-                  <Option type="QString" name="outline_width" value="0"/>
-                  <Option type="QString" name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="outline_width_unit" value="MM"/>
-                  <Option type="QString" name="scale_method" value="diameter"/>
-                  <Option type="QString" name="size" value="2"/>
-                  <Option type="QString" name="size_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                  <Option type="QString" name="size_unit" value="MM"/>
-                  <Option type="QString" name="vertical_anchor_point" value="1"/>
+                  <Option name="angle" type="QString" value="0"/>
+                  <Option name="cap_style" type="QString" value="square"/>
+                  <Option name="color" type="QString" value="0,0,0,255"/>
+                  <Option name="horizontal_anchor_point" type="QString" value="1"/>
+                  <Option name="joinstyle" type="QString" value="bevel"/>
+                  <Option name="name" type="QString" value="circle"/>
+                  <Option name="offset" type="QString" value="0,0"/>
+                  <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="offset_unit" type="QString" value="MM"/>
+                  <Option name="outline_color" type="QString" value="0,0,0,255"/>
+                  <Option name="outline_style" type="QString" value="solid"/>
+                  <Option name="outline_width" type="QString" value="0"/>
+                  <Option name="outline_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="outline_width_unit" type="QString" value="MM"/>
+                  <Option name="scale_method" type="QString" value="diameter"/>
+                  <Option name="size" type="QString" value="2"/>
+                  <Option name="size_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                  <Option name="size_unit" type="QString" value="MM"/>
+                  <Option name="vertical_anchor_point" type="QString" value="1"/>
                 </Option>
                 <prop v="0" k="angle"/>
                 <prop v="square" k="cap_style"/>
@@ -37835,9 +37837,9 @@ def my_form_open(dialog, layer, feature):
                 <prop v="1" k="vertical_anchor_point"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -37854,32 +37856,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontUnderline="0" textOpacity="1" textOrientation="horizontal" fontWeight="50" blendMode="0" capitalization="0" fontFamily="Myriad Pro" fontStrikeout="0" allowHtml="0" namedStyle="" fontLetterSpacing="0" forcedBold="0" fontSize="10" previewBkgrdColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontWordSpacing="0" textColor="0,0,0,255" fontItalic="0" fontSizeUnit="Point" forcedItalic="0" fontKerning="1" multilineHeight="1">
+          <text-style namedStyle="" fontKerning="1" forcedItalic="0" textColor="0,0,0,255" fontSize="10" capitalization="0" multilineHeight="1" textOpacity="1" fontWordSpacing="0" fontSizeUnit="Point" textOrientation="horizontal" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" blendMode="0" fontFamily="Myriad Pro" fontStrikeout="0" fontUnderline="0" previewBkgrdColor="255,255,255,255" allowHtml="0" fontLetterSpacing="0" fontWeight="50" forcedBold="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferSizeUnits="MM" bufferNoFill="1" bufferBlendMode="0" bufferDraw="0" bufferColor="255,255,255,255" bufferSize="1"/>
-            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskJoinStyle="128" maskOpacity="1" maskType="0" maskSizeUnits="MM" maskedSymbolLayers="" maskEnabled="0"/>
-            <background shapeType="0" shapeSizeType="0" shapeBorderWidth="0" shapeRotation="0" shapeJoinStyle="64" shapeBorderWidthUnit="MM" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRadiiX="0" shapeRadiiUnit="MM" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeRadiiY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeBlendMode="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotationType="0" shapeOffsetUnit="MM" shapeSizeUnit="MM">
-              <symbol force_rhr="0" type="fill" name="fillSymbol" clip_to_extent="1" is_animated="0" frame_rate="10" alpha="1">
+            <text-buffer bufferDraw="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSize="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1"/>
+            <text-mask maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM" maskOpacity="1" maskJoinStyle="128" maskType="0"/>
+            <background shapeSizeX="0" shapeJoinStyle="64" shapeSizeUnit="MM" shapeSizeType="0" shapeOffsetX="0" shapeRotationType="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeBlendMode="0" shapeSizeY="0" shapeRadiiUnit="MM" shapeBorderWidthUnit="MM" shapeType="0" shapeRadiiY="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiX="0" shapeOpacity="1" shapeRotation="0" shapeOffsetY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeOffsetUnit="MM">
+              <symbol alpha="1" force_rhr="0" frame_rate="10" name="fillSymbol" clip_to_extent="1" type="fill" is_animated="0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option type="QString" name="name" value=""/>
+                    <Option name="name" type="QString" value=""/>
                     <Option name="properties"/>
-                    <Option type="QString" name="type" value="collection"/>
+                    <Option name="type" type="QString" value="collection"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer class="SimpleFill" enabled="1" locked="0" pass="0">
                   <Option type="Map">
-                    <Option type="QString" name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="color" value="255,255,255,255"/>
-                    <Option type="QString" name="joinstyle" value="bevel"/>
-                    <Option type="QString" name="offset" value="0,0"/>
-                    <Option type="QString" name="offset_map_unit_scale" value="3x:0,0,0,0,0,0"/>
-                    <Option type="QString" name="offset_unit" value="MM"/>
-                    <Option type="QString" name="outline_color" value="128,128,128,255"/>
-                    <Option type="QString" name="outline_style" value="no"/>
-                    <Option type="QString" name="outline_width" value="0"/>
-                    <Option type="QString" name="outline_width_unit" value="MM"/>
-                    <Option type="QString" name="style" value="solid"/>
+                    <Option name="border_width_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="color" type="QString" value="255,255,255,255"/>
+                    <Option name="joinstyle" type="QString" value="bevel"/>
+                    <Option name="offset" type="QString" value="0,0"/>
+                    <Option name="offset_map_unit_scale" type="QString" value="3x:0,0,0,0,0,0"/>
+                    <Option name="offset_unit" type="QString" value="MM"/>
+                    <Option name="outline_color" type="QString" value="128,128,128,255"/>
+                    <Option name="outline_style" type="QString" value="no"/>
+                    <Option name="outline_width" type="QString" value="0"/>
+                    <Option name="outline_width_unit" type="QString" value="MM"/>
+                    <Option name="style" type="QString" value="solid"/>
                   </Option>
                   <prop v="3x:0,0,0,0,0,0" k="border_width_map_unit_scale"/>
                   <prop v="255,255,255,255" k="color"/>
@@ -37894,29 +37896,29 @@ def my_form_open(dialog, layer, feature):
                   <prop v="solid" k="style"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option type="QString" name="name" value=""/>
+                      <Option name="name" type="QString" value=""/>
                       <Option name="properties"/>
-                      <Option type="QString" name="type" value="collection"/>
+                      <Option name="type" type="QString" value="collection"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetGlobal="1" shadowRadius="1.5" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowDraw="0" shadowOffsetDist="1" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadiusAlphaOnly="0" shadowScale="100" shadowUnder="0" shadowColor="0,0,0,255" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusUnit="MM"/>
+            <shadow shadowOpacity="0.69999999999999996" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetUnit="MM" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option type="QString" name="name" value=""/>
+                <Option name="name" type="QString" value=""/>
                 <Option name="properties"/>
-                <Option type="QString" name="type" value="collection"/>
+                <Option name="type" type="QString" value="collection"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -37924,46 +37926,46 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" clippingType="0" restrictLayers="0" enabled="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clippingType="0" clipSource="" enabled="0"/>
+        <itemClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option type="QString" name="atlasRasterFormat" value="png"/>
-          <Option type="int" name="forceVector" value="0"/>
-          <Option type="QString" name="imageAntialias" value="true"/>
-          <Option type="QString" name="imageCropMarginBottom" value="0"/>
-          <Option type="QString" name="imageCropMarginLeft" value="0"/>
-          <Option type="QString" name="imageCropMarginRight" value="0"/>
-          <Option type="QString" name="imageCropMarginTop" value="0"/>
-          <Option type="QString" name="imageCropToContents" value="false"/>
-          <Option type="int" name="pdfAppendGeoreference" value="1"/>
-          <Option type="int" name="pdfCreateGeoPdf" value="0"/>
-          <Option type="int" name="pdfDisableRasterTiles" value="0"/>
-          <Option type="QString" name="pdfExportGeoPdfFeatures" value="0"/>
-          <Option type="QString" name="pdfExportThemes" value=""/>
-          <Option type="int" name="pdfIncludeMetadata" value="1"/>
-          <Option type="QString" name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
-          <Option type="int" name="pdfLosslessImages" value="0"/>
-          <Option type="int" name="pdfOgcBestPracticeFormat" value="0"/>
-          <Option type="int" name="pdfSimplify" value="1"/>
-          <Option type="int" name="pdfTextFormat" value="0"/>
-          <Option type="QString" name="rasterize" value="true"/>
-          <Option type="bool" name="singleFile" value="true"/>
+          <Option name="atlasRasterFormat" type="QString" value="png"/>
+          <Option name="forceVector" type="int" value="0"/>
+          <Option name="imageAntialias" type="QString" value="true"/>
+          <Option name="imageCropMarginBottom" type="QString" value="0"/>
+          <Option name="imageCropMarginLeft" type="QString" value="0"/>
+          <Option name="imageCropMarginRight" type="QString" value="0"/>
+          <Option name="imageCropMarginTop" type="QString" value="0"/>
+          <Option name="imageCropToContents" type="QString" value="false"/>
+          <Option name="pdfAppendGeoreference" type="int" value="1"/>
+          <Option name="pdfCreateGeoPdf" type="int" value="0"/>
+          <Option name="pdfDisableRasterTiles" type="int" value="0"/>
+          <Option name="pdfExportGeoPdfFeatures" type="QString" value="0"/>
+          <Option name="pdfExportThemes" type="QString" value=""/>
+          <Option name="pdfIncludeMetadata" type="int" value="1"/>
+          <Option name="pdfLayerOrder" type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
+          <Option name="pdfLosslessImages" type="int" value="0"/>
+          <Option name="pdfOgcBestPracticeFormat" type="int" value="0"/>
+          <Option name="pdfSimplify" type="int" value="1"/>
+          <Option name="pdfTextFormat" type="int" value="0"/>
+          <Option name="rasterize" type="QString" value="true"/>
+          <Option name="singleFile" type="bool" value="true"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" filenamePattern="'output_'||@atlas_featurenumber" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" hideCoverage="1" sortAscending="1" sortFeatures="1" coverageLayerName="cone_only_groups" filterFeatures="0" enabled="1"/>
+      <Atlas coverageLayerProvider="virtual" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" enabled="1" hideCoverage="1" coverageLayerName="cone_only_groups" sortKey="&quot;group&quot;" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.91765693375520385" xmin="18.38526494898227526" xmax="18.38637629180237809" ymin="-33.91825474477089841">
+    <DefaultViewExtent ymin="-33.91825474477089131" xmax="18.38638986218385796" ymax="-33.91765693375519675" xmin="18.38527851936375512">
       <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>
@@ -37977,10 +37979,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h" frameRate="1"/>
+  <ProjectTimeSettings timeStepUnit="h" timeStep="1" frameRate="1" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -37989,29 +37991,29 @@ def my_form_open(dialog, layer, feature):
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option type="QChar" name="decimal_separator" value=""/>
-        <Option type="int" name="decimals" value="6"/>
-        <Option type="int" name="direction_format" value="0"/>
-        <Option type="int" name="rounding_type" value="0"/>
-        <Option type="bool" name="show_plus" value="false"/>
-        <Option type="bool" name="show_thousand_separator" value="true"/>
-        <Option type="bool" name="show_trailing_zeros" value="false"/>
-        <Option type="QChar" name="thousand_separator" value=""/>
+        <Option name="decimal_separator" type="QChar" value=""/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="direction_format" type="int" value="0"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="QChar" value=""/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option type="QString" name="angle_format" value="DecimalDegrees"/>
-        <Option type="QChar" name="decimal_separator" value=""/>
-        <Option type="int" name="decimals" value="6"/>
-        <Option type="int" name="rounding_type" value="0"/>
-        <Option type="bool" name="show_leading_degree_zeros" value="false"/>
-        <Option type="bool" name="show_leading_zeros" value="false"/>
-        <Option type="bool" name="show_plus" value="false"/>
-        <Option type="bool" name="show_suffix" value="false"/>
-        <Option type="bool" name="show_thousand_separator" value="true"/>
-        <Option type="bool" name="show_trailing_zeros" value="false"/>
-        <Option type="QChar" name="thousand_separator" value=""/>
+        <Option name="angle_format" type="QString" value="DecimalDegrees"/>
+        <Option name="decimal_separator" type="QChar" value=""/>
+        <Option name="decimals" type="int" value="6"/>
+        <Option name="rounding_type" type="int" value="0"/>
+        <Option name="show_leading_degree_zeros" type="bool" value="false"/>
+        <Option name="show_leading_zeros" type="bool" value="false"/>
+        <Option name="show_plus" type="bool" value="false"/>
+        <Option name="show_suffix" type="bool" value="false"/>
+        <Option name="show_thousand_separator" type="bool" value="true"/>
+        <Option name="show_trailing_zeros" type="bool" value="false"/>
+        <Option name="thousand_separator" type="QChar" value=""/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/marshal_positions.dbf b/GIS Base Map/marshal_positions.dbf
index 6ca66a9c39f0890469af6bc68cba95327835408d..eca9b90fd1c458ad4b6311133f53aba11f9a3f0a 100644
GIT binary patch
literal 47650
zcmchgNseU6afX}HiV}DMtzu0;4?Yh7ciQU?O|StrK(PpQgH-E;x`uAT&pk6D%_1`w
ztTOWlD@0{wR#~~bxedP!@1Oto*T4C{Uw!x8|9|(#?>>5d{KMl<|8xEBUmjn+{N^uT
ze){p}AHV#Wul{5G$@BMr{^c(}y!_<H-~aQMpMUu2<p=iP|J~~k-#`B6mj{Q<|6iXN
z{Nejw?mxP}|4;X?UO#_xdwpVv(CZif_5FYU^vCc2bpPI0e*Sw2vF4Dj-f!vtZ^V!w
z2R<oZtw=sOhU~y6#%pHDr^HYk_~dlOCi&DDst2EWO~t3h&>Z;Ge2psC(_`o!e8x4D
zyp0%!1E0?M1i79W!*t*?(lw{xvoESWpBjtWx0D8C&nM4xRVi;V$LMiSOS^iM`&MG~
zxTj@YMe2i?Vsz1O@R9c?_81-RPwVw+N$y*V=%JU#&@QwQuO#nJtT8(1w>H|9<i3>|
zi^Dzby<h0f`^n$-avbbwALZ(D-zr8n*q=`y<El~)mKZp!XM}oXc|I*g<j-8*W(fNJ
zv=Z?b?D@ocO{sTUjm<%>X9^eRe&4BEYz=Z)Pp--?#Fim*J}rcD;TOKGr?gn?*V9AJ
zSCxKZDY4kgK@ZROv|wTF<)DYwuQ=qsrC9E}Xs55+81q7J-v8xW%oDPggI>6&(w^oK
zv%MeEYQ|4g>*+Du+tY>^UqkAH++uz&*T4VaPhbA_x|{##$BMHWzpkSAgqYvkg>UAQ
z@khJV*Qv+kux~4FY*N3a5kK%pzkNM9==I>3wD<D%{qMj0^@o4-U|xTIpATNHwm-SV
zY_E4(NyH^mkB%ORhh82-eSjEiJvv$(@8$X{w`~8lmwkJR8*?a-!+NlD=(C4@%K_-Z
zUSGGo;u6KDWruhhD_zw6$rwHdJcR!|c!<zDIdsV5eEKy-T%W^$9Qd@V;`$sWWY4FB
zepO+&7g`0L@bVbm(-QKP<@pe8M|(dWy%UxHmVy2p;yJwOc_n#&VnNjH_pJuv9}&;x
z*dYf#xvO|P#{t>%0o7A@NRAV7;Pb2xQp)MBRSo4DYoq+$oC@Tyo=&_V>}gIJa^Tal
z!eMi&kUgJXy21}~YLGpjQSyafct81DP6Kk_GoH_<XAggL7UEN>ueU+9U(W=8Q+`N}
z8U6k8*xeuE#-Yz=3$_QJeibPPc|G=gFl$eIN_OzCdz?Dn&bdPN>q)g-#G`NbC%61T
z-1y4)t3H;0jZte?5OG${9kO2!##8&fd1QyUzGrX>{DHT9!vQMxepN5v6cQ)j;he)g
zEyN4T4=E`-;5&Wge`H=Wmjc<#K_&kqaiqMise?YK1OHmu?NYM`{s!=(<E*kmJo|m?
z=_zh3J)>7&9z(m()015&Gdtu<dVjvBHDrf8MjzlvN{`l*kqh&E8x1`w<Ar4w9OQa}
zU(5VYt_8AR&+>O<T|llCa^M5LGlgGOLV`T_U>5|Roi?-A*N7W&qp&|UB*=U{1FNR+
z>wSIf<qgo4_*BSs4F$4aPa+PMxPJ{5vgh-RE7#B=2R`8B5_hSgK@NO+QFsWr1!T{s
zlzDOPcS*k0Fd+v%)CEZYZB;!v;9_i2RruSgK5)RrMnxaUd`XQ7vfsBlg2Mf4%#b~w
zMxIvI*{!Um1O7G|@sGquYpjsNdS+F)*vi&B)Vqw19+h!cjkw$ndIxQ$>H=yUko~@`
zIuzpgyCmPhWg&Y$qiQ^)rU2RVnQ3Z!nqo~3{=p>vQTHdM>VS{V!2OYV!0q<h>w}qA
z9g2vvYATTV`OHMVeu}(vO%-zB^Hj%GQ-kdJkW|wCPU_VGx14~kDz3*KLH6q@#0#>%
zx26d>@aaM20aupxgF1&-#$WZZaIxjwDBNXbvm9{P*})TKK5L==`L0#%;`)grul@K9
zT-u+{Xw-*@{M<ra9B|k<C-nz1p4$Pc^?FhW;0MZXXG(|6^#Od)qsmXrz1rij2{y#1
z0`H{`3bNm~L|vMSgY&HR^<u0Cdn)rKwP5+o{eu*8Zwl|NB|`T5w&D_rhtxtQz+4~T
zM3HZld6^9(nfnJRP-c7K58PL9tEE8p`_}N|m0wkAwa0tYs&3JKZy{1~&<CA5l&<!z
zS9`pd^?;KrKfa7w9Q46>#&^oB_P8?IjeS#gVFO9_@;0eMQTlBMs1AI{(<<C$JHF<8
zVxS&L)?aV9*IpmcD~BH<;{|T1J$_9O4tiAPnd*M*_bn1H$U5R$8)VOiu861e>9v~U
z2MKga_y5#N1a7YnsO6nn@6=hVdAyLQfu1TqR~x3!-am+i{I;xvtSv(Ja!|NGGS5_7
zg6#PK8tL<CrP}w)0J4zJQvP+zxF!zkNxILd^az>r32o&|gxxMZK=yn<KQx~<OS8W}
zq2OOjyHMJI?AKFrQ+l+t4mt3l9#-1Z(rD4J*ViPoHJ-TLM031q#XnKm)6%FIaqzDb
z_>Sy%-enH<_cYK%pz6{}OOU-B#HT)q-EQWf4+3&6^XP>HioN}ba}u9Q`%~(KtoJR>
zL0{+)xPPewa^OSUDD(BDcF2Lxs>2s}$g*<w{u@<;)Wb?Yafheo`T#!UF(i((qHTNs
zI!;h9g)8s!Dsz1R4m;61(w^=FgS{M(>`{5Z-L7e_4<eUR$8)Qi!lCYoG9g{JLH-`H
z-#5zPwf!lh*y9Ir#!8$e>S0Tv1k*tu;E-PY|L+#(wydc=zO&XtpR1^=*|3;{K8Vbx
zka#?K8XkK&pcz=jCA)moK_5hLa%E2op2_{R4D%(lW2t`H-6rm!4+8p4`J*LJT5Nwl
zfq6B`kI%E%<MDB<yo{VvQZk(&_Wr>jo1prtOUA<5>w__g8`b&bMyO(bK4Vf>qx`B}
z*lEvaEIlgnbF0eRAwM?;eu%6a+-2VO`e1bKkBYZ<BbfcZ^#QIdaLd(o=#UQ{z3cwQ
zk_KeIo<@F7=9x<BkUgJ5ydd$al4uomxId(Sb^H@MkevN`5^<Ky*RSaz9`$c26W2@s
zAdccu$3;Y^{R3Q7k2<c<$pcEglgI?v+qq6)qHs(4k|A?B=uAIRxFt0skOLp=w(QH<
z?M(K1v`_4UoHw}L5PLtdPvR2QM_ER8h!=V%Zzki$oC%5S<Db6f*~#<CiIOXOKFr_Y
zo(h~IliF~Q>sHBU$$4p+(g%lo`kv1oEM<OwfGMaC5p{#q|3mhC68%3iK4mTj<iO|2
z@7?9S_Hkol_@mOJc=nLTdNiI$#Rz21hw^yskCN$x?D=%+-()?-E?2fcpE{YdAm>V@
z#F07dTV-yZ#1D44vcq~-o~a95nMw}G{(P7!r|i#~M(ogELN1&BIiYu!)^Vs)UFBhF
zj%K1D&cXgr9)>;;_}iN5;ZUav`kquA>^0YL;n(V(uCX5WepMwctMG%>z3mWhSEkpg
zI4cE^G7tMhTrY9Uh$5Qyemq$}a6W;<#t|WNeL(eu?%$4MKn{HH52Qaz<sD?sr#AY)
z)IDVyu|r>5ZNym;PuydEJnqlaJfRerd}{B9P!pu{joZEUSPy+UaxTsePwnF@&WHLC
zaesC@lY`w}bAq+JtpUFFay^#)k@hsL$DYre^fQTkV@ga^v_Bu5HQg_hQisgf(*pR8
zo*%yysX3oIh!-SI9!YUI;7C*(Xg_|t@eXo8mz2r}@3HO<_J@KOg(EGi?GbMi#jAcm
z@`8}P9MG7faHLgb=a8put6xUW#fhmv=IdF?OvMWkVAf;)8)`=NwZ;9Iucr?5ft<6j
z$0yp`xwh*9g#C#lLFVh({+sOoiG4u!d>A`>b&>yxAi%`MFOOZ`xdr-iWdFi$XR^23
zoq{oq$CHS5@T-7bo^kR~9OC*Bs3(_o#A~|0gC8;ybC2a*>fHure?Eh8ma3n2w}CnE
zVfdr27uy4t&E<Nm`Zw&_T?5=onveq@`dnomW4~U;!ETd`Q+kw2T*!Pqz*X9R+i<*t
zzK)H$L5c6Ij#Q7h9=}TV9j@t?4!8@KpLr-Ef6Drxcjsd;*Zs-wU1NgZpU=1R;e2GB
zYU~MeSPymUvYukUX6XI>`S$g!c|!7hI>RX6%iFi}dCE7gtl0;+<+r~_VD(AJ^-!4q
zfqwgTK26VE*<*g}?Lx~FyCC#I><xM+Z?AvwRUa?&{izF3_jD)H?fEcOLDiGfumw5r
z!9P%S>pL(p=QDr{RGxOdO~PZ|6XRS|-g%)R4!FxIZqapV8z{HmH=GV-e|Gt(ecVV9
zw8pQuxY^4aFX_{BJ=WVO9r9U3Z{)MYdjtxd{SJ9r<{Ij`;k+jSvX_HEy|TpP*R-^1
ze?F8AMum?q^uQtSyn-FQp6ytf?;FiA&we6hT=w?|IKC<WdcPLoy<hdZz_0pvu|M>Q
zEBmuFk;8fzQ>60fr6<Vxd`Kygua|PY#{`@28+_=`Qgy^@9I*o*2AL^8WVd~opARXe
z)z>EcowCMlnEO?f8W5k#Ia#GQ$XpJ1=dG>}DV;YznCnqWXx4hvzKvp!zrkhURiZwm
zQ21?+zY!Y{H_H5683D3CAG|e{N8fO~x&2{1_`Sp-cTICEAWQZ*EPSY2SNPj1>$KMg
z%WYS4b$7d&y*{9-TjxvmSR4m^!2e(CgVBopd(_DO(&wshOAtBk?aO0^U&CkRvjk2~
z{XgWuhrViAmsV(?v9Ci}^C`5SxL+Uaa8GH|RrhC)k+GGx-@ZL>`d}4u7|%a=WAj_d
zr&r^74xjKD)WDd^+b4V`wOt4J^iV&*#a<bI)yK!{>2%oI%JnCFQZ@E_KjD+Bu|N6=
zpEa4_gd8yL>4ZLD@SL$f`pLd^S`Ga7ZA}w0p6Br4dX}^q&!_l=&&bB}Ha_7q8DVqa
zd>Ru{Z2jwx*Rx)`d_cctDj$sJ)qJuZUI%9DUw^`fcIN~7ZI9JGpx@%4;_86B?e^0H
z`^Nl1=)^s3`GlXCTZc}pXXF!pVr~;Uu%6C{;sbJ>X*4+DC+5x@f$pe<O?>*Xep|0Q
zJfTO|c!~r1V2=$yphua94V{qdo{#9a&V=FvaU(bxbYS1eq@A#Hc|_>MdUylK34O3$
zOL{^dtg$#J^uZeMe?TAX*BPDQ(|SDNAKY$_uBqG2-u~Qg3>W87P2tSvG4;!t&*LqT
z&U_x;s5763^>OC&K*^o?&<%8dJms29=iME3y+11hd1O6rV}5+s(<n!HeO%9nxbX-d
z`e~2w;f)L@_)z72M6OqA{m6RW+9+M+nrQ)dx5}3f6@5qc?d|n*zU$%5kw?};2j>Ys
zl=~l%YYHFk?x^eefWjWp*UYavqTd+&bws~Wj&$Unl4d$02f!3Z^c(8nh`)n-aO9ri
zR-NHP-TDdr#x&I<av;VyyXrTl#~-;r%qKsh-*_L`5&g#dz>df@Zpab2#+)9JYsBq{
zU0Ck}JE0FK<T~OXVCIhaiM$W&h@Z&Z{UiH^8**gdDD*tCZ@fqCh#qB9!4W+Q9CAdD
zHU=o3&<BJINAxJy=ZGFfy&ch`jpxYu^hbKZ)vs#fQGVddXFkdgT={fbk4~HqgOHEt
zQN-Ygymg)<`^KAokMKdTkMO|}Il>3SeT2_j+S&D<0`ncQbHM&b>^75sj_92}A7vY^
z=fgF9=(oGvecPw3dwLwn?e>_u@@@b6+u#0}5A%qR_@g;I#w)v?4{3}e_b2n*_trBH
z2wZhUzX6XPu|KHM$Nll#w>6*d#QBgeIU)zZRY&Y8Vb%%%V2^3MACSEqJXFA%!t_X_
jyYg8B6ki3-mCsC%M7k%RJuvOSddQ<c66p@>`M19VA$I~>

literal 47650
zcmcg#OO74K5v1*vE%*Xn&6<E4_5T3gdG9+=5CI90MZqF$(<k&bd=p2%PjM>h^+Inl
zx&h&FhBHiMRaSl?BddS+pWlD;-`~7@_rG`FzkBrj@ZI?C-}XQKVSIW0!_S|7`Qh^q
zpMJtuf8D>sfB*T*&mXTp`S|aD`t<qZFV`Qq{Qh5VKYaiA_m?5zBL5o_@ZE<m_aD9d
z{crDI-9G>L@_szt`IqbS_YeR0<@*mm-oASF<Il<Y99`IIeF>ACAdnN{RuajH0y*Aq
zJ(8RxkQ2k^3(3g}IeqIarwHWaxV23BRE3<jHMX}VkW;Zgj`ZmQIW26x&vGF5`WT+m
z>=UnB2#R&<VasH1UU5!S*{Y{?Q=HS(wnYBGOZ*$;(E0I#^HXZxN}zQU_=D2?7U=wV
zfqyHlY=PD-3C?M)b#r9bSrAWaOIxLN%L0E;TiY_(K@sTFT;3w>5A4s}zjf!9^MicB
zUXIUOC%;n!cHM*9u<uh|RRrg>$INlT7khtQoJ*S{drS8ER2SoxDNjuHc2M1ea|-`$
zZEw|;y7@NSL9#zTrM14nZ%+0W?fqz}3FnmJX|&HnN{+}ASs(j&T2k>_BYzNAyZ-j$
zkDvZ^vyNZ;vDaAz|80rota0JZaw784O8z<s)@`pF3;DMP`RLpAiEh!StoHWd+fV=e
z_-i-j_VbthiKrVne~b2hr=)<og#0M#q3dH;FO&$oW<T0iyMA)XF28nNx3zAJPOxqf
zaSs0MwSSAw-d~rv*Ci}Rv2Lj6==?+{h}#i<hw`216!sSD*5|rDy7ipC-QG&(x;{EV
zoJ+25d5+srP}d_a#4XNo0j}t_Oosj-1<(0g6x4Gi`@RJ_KVIMuvP1nd*K<)&ZzB(>
zTyIC@bJxdke~L$(V>=Mob$Q?qf*>C)zH#0ggTM|-MZGY`(-;JPw3Ns=Yy@s$ZU;40
z#t&i;#GjVphP-f!rw{VCn}Sb$T=Ij~9_)`G{`7?Ul>BvE^XsP+x&6{bpAP(u^APy&
z>tp8+P&c+^f1>?4z0{|P>>%2opXz<w7CH9*p!&Yl+ejVl_b24EMP4`ib6TS>o15#b
z2)X9=hTys6y@I;FM&K042PVIh?9XXUz$pkPkEp-R*Dax5;5<Zt@6^5jLw(Jtz{N89
zKZGMi;63K+mK*YGirWhO4GH#AXDM*Y8rHfI{?2^eYFOifpkGq!gL5kAW7Gy5iTx<-
z!hGFYfgh!MAq(uf1HY#JPXrEQuFszD5HBERL7eNrclw-HCG-L8^~s0}vz#p8yTIH~
zH_q`V3-oC&qF+DP!C8RsG#^l(&UT#z_*)C8g9-P~0{pE#z?HKAuWCC^PPj{kf3UXe
z7HeWW1ki=OoRs>8eSe)-WdSbM5_kcWzhwa~)?i$Wzhwa~)-wD7^-HpVAJTGjjQeK+
zucj6BX^Cft)Y0DF3hE!iN3#G=Y^7($#WHwz=I6A+k5ZkL1$bhsdEo_Q0iM`)9t!IC
z$sc%oJh8RB;2{~jA@lv|p)c_?*w=HdqyFLZBfv+y!}*~;U>4w(J?uP`xz5T09JUAa
z>-*ey&H{Y2hn2^b1^8%3Q)$U}1by@#5r3$zM@TY1KPVTFkMjQ5`-7gU<31ob=Jxs^
zxnbNT3vk$8fhSTwD+_SgjzoUR;{`ZuZw34is!Ieshu%B*2UO45<FLUw;0GMHAMkf>
z2KdwmaDT{wALTsJ9)}GOgZgyFdqIV=K0lBHUK-cI_IxqOK|G~?Nw&v(gNwB=-ka_5
z-r)ASgz%7TkM}|j`i;~t$@VyGa3z7~O?9I^t_(TI<2kRg$9sdT;EQqIYmfIr4tOY)
z*UcR7g&g4Ii#`H>0H9*YckFRxcsHyY#|3*_Ik*lU3i~&EzCYxkPs_NAJ$@a$10RX_
z*V!JwhMa^vgz5!*{5p6KKT3V3Y>!_<4(bKQVbQO<K4$&;;KSah<#n_72R@+QUiQb{
zANYX&5Br^LUM~c{*IC4a%=p@Te-irJ#DmQC^D@CFoFD2lW&3%V-~k#f`(r;Z13Bnt
zaei$-UjjK{nKMe@!&%#bD|^3Wj@u|%?d9aW;7F<1pC6ZyUz6WS5BTvn1)uu3)ITW}
z_M@rT`!~1qVJV&_`?)F93+OjeTuAnFV0-=J*<UBYIduW}4$V6!!8vt)pVypuPf6h4
zoL}c8FsfsJP95x;`sm3%{`lTepHlou_VLvBhPlu-<NgWx_VqE#cOVCKBlYW3HundR
zv-9w0JS5rYZ(t3A56k|*J|Be~^f3rWO7{7+?;x%-uAJ=a1>bXr-=TPFU;jW3<`;+`
zpX}>7-*H%$_+ww6deDRx-UeFu_UAMpf1`RKC4oQi8Fd!L1p)u9BO%@J|NpwL2@0nD
zx_R_z@$b%Z?D<vQ<9-Ul<I$=S=o7&YVSViRZ`}hY=Xh$5kNWPBC(=A^vd4RUckpkV
zkJ{tckc0bbIFGl-<30M@%baVn?=L{kJ{LOAGbQ_e3FM$|<o&Vl|3D6SHJn%3_p?0s
z6boLJ1pT?zkcSX&FbVpNt>XM}y)EdUg6{%cdB)$8pdZ|7UFI8;pkEKVGVm&ja{~SW
z_<YEBC@u*26b<C$rT$Uys{-mQ>enX)|1Ct+^|WpZ9v3R0B|lK`xLidaaOMRh0gtPq
zFk##hqsiv^PVJaCBis^Ka0uieZWDh85SBm=;sV__m=O1_k6m3~JL(diqZHH&wW4oE
zbz>CdJ2e6yrTvMpbL(}({X00PGfoi&c3m?1S#)1o6r9tCas<3vz!czz%)B&=0NC$O
z!2A!@r??tJAZN{cJ$QHK_J+$J*^eSg703Y|LU}L99OiOBk6-dpG*#{8RPf)ZuL-h^
zy_}AF7O4ISg1jnc+?z-EK@jk6^WJBwGp-CWhyA)0%(+th0V%;=&W>9WUpWYPs^ErY
zzDF|%;t#lC@CP&g76f%x#syaF54?SU&gUJ!=5s2jPjgxEogk>UbKUdNxn2m8_=CEh
za7%zo=I5sb%vDo;>f!IMk6k`m0&rO3hX5oI$U%NU`6$SD=5lhu92lQd!CYG|sIv%9
z41)O*aCMgZ#XyP^tQ+J|zY*jifgH@`P=6bw9)TR>A>e7e?k|7@V=rgFCwQ?pMgF$O
zpE-{Yg1M>OJLZ|@eq#{KGZp-!JTDUj_*-$ncb5C(?fqMBs22z)_W~R#H_RauE(R)x
zy<KB)m;1rsV4BN;d&9cTbv;^K0y+EpBxd{?twD1+I6t^&Va`Lmpif)&c^SGF$4k!X
z&byucs29XJ<U7ET=KR_#;&y{SpnDd){oIEy7hV9ZTeCl>m;8<9e|)vKYmB|)-W57O
zsEe<UVLs|GmqYUlNq`?z5XKffUXWJ-c6or4+wV_v;FFUdO#(cz1>Ac~^+FQlRW0m%
zu{qyCsc&v?4VOPId@%t|(RThD;@azcGzoBuRx#(w@kh|7#aP?oM?uCl-ygtLOa2CO
zu|Q4%Z*Y!37)rI56OdQY+@TlXF4!O3heCPC1Ae^0z3yw?3mo(Me2oilmxKKwo~lPY
zvX=wiI`Jv|gE@(}>$Be{MEmn#PU7uy)_$XZfLp%(Jp%ij1nKj@zr9^fS?*o&0-jKb
z9dTjy2fo_Z^(BHAz~@xJe?y)a8Q<{&K401M1HzG#pwH9-cmdR>O#-|Mc?jl^Ic~3h
z=jMo>`q=M12Hk&oA4?L{Sq(`C$Dbsq8{2+AEaBHlP|r1hV2p<#^eu7Wsg1e)(q(@D
zQZD=|L7x`)8ZP&S<5dav`Z(~F36GBgzCUP#p7GHr@CV3umi|H%_=AF>B903|z!L&4
zRu-HBJb~-;HLtpT<Ef9`t_xoBvc#WekH=r+P#--#$lsn)<n~LKIm(KDJ=t}7kdMAy
z4(79Xo=G7G7n!lWCESZ~ea!3tEv0>~ZO(TR=BTXY;2q28Z&O`wpI3p>fO|BFACi#I
znd<`*&AM*p_ztA(c-71gN%r^~T7IY-sXv#Rc|3(2oFD3=<LXoU{fWqXQHM;pi#-kt
zeZX61{LS89BMZTM)aYK_Wbd!9_bgDqB-!)qAP4tovOlnYj~ZIPm~&;^(*C`0khAx*
zW}F-&0QPpBF;~s;)Sia|ebziNVb0pzkLLaTGIN~;j*_XI_g|mMAArkok{sLk^HrVq
zq>rt=9m}!p{~XGBfQ#KW?5U4qIkt9vEXNi<IF@5uFC5FU%}0;roa7IT^U-5{&hZD)
z_&$dteWLOG6vuMT@o%`o=9IV)jqgJ_TsPzUU5@3P<KLq3{X56{oa5i(N%@X9uIG-{
z%^Tws$8t{cqbKEw(fHo4qjihM_m~~aImwTnlqaHPcTQX|#zznL#~8OfmUEIHHO4KE
z^*N_*jK;X-u|6l|RmQmGp*|<YxoC`A9_w>bUS*719_w?GKQP8EkM!{;`5k{!esGU+
zFE2KIrq}D{U%q~Iw`#SVyS1t1+))a(oO|?9%eiOQYB~4lqn2~eM%8i#4Mlu@2Ax7J
zXB;4{KNz%iwLZhJ#rh1x7Rwoit(7yzv&8!|#?91nMgS78+Z~Qq>vPgM9pe~keNH;3
z<C;0KK4Tn1EoUSmTDu<CL8|pR$-fQywOF44kE-RIWCsIAQtNY)zaB83Sf4?|SIaqR
z-NrbrTA!2R+<1+eTA!2r+qiCBtk0m6tL2<z*W-GBwLT}=^?3b)TAu+_X!DRkKTzv)
zQav}W-52XKuBTATIcePnZ9}Zjplzt-3?No}e#UEt)cTxM2anf4sr5N2zaI1hwLT}+
z+k<|f*5{<WYS0hF`V2a`Sk9n9s^y$yZ-eeH)@O__sO6mGcgA>$TA!2R!WjQi>vK}v
z9yABBK7+QQmNW9ir|A95FMaJazkhk%cOK@p{Kj+NIFd82!4R+8xVA_w=cIajT#KXD
z=cIajyq-y|&p1EYdSP7WAl7G$@vG&W6i>%B^<sVS3Z0uHv$uoS^R&VEJwvbk=q%@M
V*lK<51%p`5Xr!y<2<_lc{|A-%QVRe8